Ticket #16006: lazycache.diff

django/core/cache/__init__.py

@@ -20 +20 @@
     InvalidCacheBackendError, CacheKeyWarning, BaseCache)
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import importlib
+from django.utils.functional import SimpleLazyObject
 
 try:
     # The mod_python version is more efficient, so try importing it first.
@@ -177 +178 @@
     except (AttributeError, ImportError), e:
         raise InvalidCacheBackendError(
             "Could not find backend '%s': %s" % (backend, e))
-    return backend_cls(location, params)
+    cache = backend_cls(location, params)
+    # Some caches -- python-memcached in particular -- need to do a cleanup at the
+    # end of a request cycle. If the cache provides a close() method, wire it up
+    # here.
+    if hasattr(cache, 'close'):
+        signals.request_finished.connect(cache.close, dispatch_uid='%s.%s' % (backend_cls.__module__, backend_cls.__name__))
+    return cache    
 
-cache = get_cache(DEFAULT_CACHE_ALIAS)
-
-# Some caches -- python-memcached in particular -- need to do a cleanup at the
-# end of a request cycle. If the cache provides a close() method, wire it up
-# here.
-if hasattr(cache, 'close'):
-    signals.request_finished.connect(cache.close)
+cache = SimpleLazyObject(lambda: get_cache(DEFAULT_CACHE_ALIAS))