Merge cache fixes

tests/test_api.py

@@ -427,6 +427,19 @@ class TweepyAPITests(TweepyTestCase):
         self.api.home_timeline()
         self.assertTrue(self.api.cached_result)
 
+    @tape.use_cassette('testcachedresult.json')
+    def testcachedifferentqueryparameters(self):
+        self.api.cache = MemoryCache()
+
+        user1 = self.api.get_user('TheTweepyTester')
+        self.assertFalse(self.api.cached_result)
+        self.assertEquals('TheTweepyTester', user1.screen_name)
+
+        user2 = self.api.get_user('tweepytest')
+        self.assertEquals('tweepytest', user2.screen_name)
+        self.assertFalse(self.api.cached_result)
+
+
 
 class TweepyCacheTests(unittest.TestCase):
     timeout = 0.5

tweepy/binder.py

@@ -7,7 +7,7 @@ from __future__ import print_function
 import time
 import re
 
-from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import quote, urlencode
 import requests
 
 import logging
@@ -132,7 +132,7 @@ def bind_api(**config):
             # Query the cache if one is available
             # and this request uses a GET method.
             if self.use_cache and self.api.cache and self.method == 'GET':
-                cache_result = self.api.cache.get(url)
+                cache_result = self.api.cache.get('%s?%s' % (url, urlencode(self.session.params)))
                 # if cache result found and not expired, return it
                 if cache_result:
                     # must restore api reference
@@ -233,7 +233,7 @@ def bind_api(**config):
 
             # Store result into cache if one is available.
             if self.use_cache and self.api.cache and self.method == 'GET' and result:
-                self.api.cache.store(url, result)
+                self.api.cache.store('%s?%s' % (url, urlencode(self.session.params)), result)
 
             return result