Fixed 19949 -- Cached template loader now caches TemplateDoesNotExist

Thanks @timgraham and @jdunck for the code reviews and Kronuz for bug
report and initial patch.

1 files changed, 8 insertions, 6 deletions

diff --git a/django/template/loaders/cached.py b/django/template/loaders/cached.py
index b33b4e8446..0429d7f9e6 100644
--- a/django/template/loaders/cached.py
+++ b/django/template/loaders/cached.py
@@ -57,9 +57,11 @@ class Loader(BaseLoader):
 
     def load_template(self, template_name, template_dirs=None):
         key = self.cache_key(template_name, template_dirs)
-        try:
-            template = self.template_cache[key]
-        except KeyError:
+        template_tuple = self.template_cache.get(key)
+        # cached a previous failure:
+        if template_tuple is TemplateDoesNotExist:
+            raise TemplateDoesNotExist
+        elif template_tuple is None:
             template, origin = self.find_template(template_name, template_dirs)
             if not hasattr(template, 'render'):
                 try:
@@ -69,9 +71,9 @@ class Loader(BaseLoader):
                     # back off to returning the source and display name for the template
                     # we were asked to load. This allows for correct identification (later)
                     # of the actual template that does not exist.
-                    return template, origin
-            self.template_cache[key] = template
-        return template, None
+                    self.template_cache[key] = (template, origin)
+            self.template_cache[key] = (template, None)
+        return self.template_cache[key]
 
     def reset(self):
         "Empty the template cache."