diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3835cb51e7..dbfa43fde7 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added ActionView::Base.cache_template_loading back.
+
 * Rewrote compiled templates to decrease code complexity. Removed template load caching in favour of compiled caching. Fixed template error messages. [Nicholas Seckar]
 
 * Fix Routing to handle :some_param => nil better. [Nicholas Seckar, Luminas]
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 56d174e124..923a1c28da 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -129,6 +129,9 @@ class Base
     @@erb_trim_mode = '-'
     cattr_accessor :erb_trim_mode
 
+    @@cache_template_loading = false # Unused at the moment
+    cattr_accessor :cache_template_loading
+
     @@template_handlers = {}
 
     @@compiled_templates = CompiledTemplates.new