diff --git a/apps/amo/ext.py b/apps/amo/ext.py
index 1e1d17b5271..9f58b3bb354 100644
--- a/apps/amo/ext.py
+++ b/apps/amo/ext.py
@@ -10,13 +10,13 @@ class FragmentCacheExtension(caching.ext.FragmentCacheExtension):
     def process_cache_arguments(self, args):
         args.append(nodes.Getattr(nodes.ContextReference(), 'request', 'load'))
 
-    def _cache_support(self, name, obj, timeout, request, caller):
+    def _cache_support(self, name, obj, timeout, extra, request, caller):
         if isinstance(request, jinja2.runtime.Undefined):
             key = name
         else:
             key = '%s:%s' % (name, request.APP.id)
         sup = super(FragmentCacheExtension, self)._cache_support
-        return sup(key, obj, timeout, caller)
+        return sup(key, obj, timeout, extra, caller)
 
 
 cache = FragmentCacheExtension
diff --git a/apps/api/templates/api/includes/addon.xml b/apps/api/templates/api/includes/addon.xml
index 0b27dc3bb0d..9ed0965a378 100644
--- a/apps/api/templates/api/includes/addon.xml
+++ b/apps/api/templates/api/includes/addon.xml
@@ -1,4 +1,4 @@
-{% cache addon %}
+{% cache addon, extra=[api_version] %}
 <addon id="{{ addon.id }}">
   <name>{{ addon.name }}</name>
   <type id="{{ addon.type }}">{{ amo.ADDON_TYPE[addon.type] }}</type>
diff --git a/apps/api/tests.py b/apps/api/tests.py
index 60f8dae24b1..558da68eca0 100644
--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -92,6 +92,16 @@ class APITest(TestCase):
     fixtures = ('base/apps', 'base/addon_3615', 'base/addon_4664_twitterbar',
                 'base/addon_5299_gcal', )
 
+    def test_api_caching(self):
+        response = self.client.get('/en-US/firefox/api/1.5/addon/3615')
+        eq_(response.status_code, 200)
+        self.assertContains(response, '<author id="')
+
+        # Make sure we don't cache the 1.5 response for 1.2.
+        response = self.client.get('/en-US/firefox/api/1.2/addon/3615')
+        eq_(response.status_code, 200)
+        self.assertContains(response, '<author>')
+
     def test_redirection(self):
         """
         Test that /api/addon is redirected to /api/LATEST_API_VERSION/addon
diff --git a/requirements/prod.txt b/requirements/prod.txt
index f9a15573378..9daf435b611 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -17,7 +17,7 @@ importlib==1.0.2
 django-pylibmc==0.2.1
 
 -e git://github.com/jbalogh/django-multidb-router.git#egg=django-multidb-router
--e git://github.com/jbalogh/django-cache-machine.git@c8af0214#egg=django-cache-machine
+-e git://github.com/jbalogh/django-cache-machine.git@89ce18eb8fa#egg=django-cache-machine
 -e git://github.com/jbalogh/jingo.git#egg=jingo
 -e git://github.com/jsocol/jingo-minify.git#egg=jingo-minify
 -e git://github.com/jsocol/bleach.git#egg=bleach