Kiji Fixes

AWESOME.diff

diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index 6544c89..c9e194d 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -5,7 +5,7 @@ module AbstractController
     included do
       class_attribute :_view_paths
       self._view_paths = ActionView::PathSet.new
-      self._view_paths.freeze
+      # self._view_paths.freeze
     end
 
     delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
@@ -67,4 +67,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index a508a68..4494bad 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -24,7 +24,7 @@ module ActionView
   private
 
     def caching?
-      @caching ||= !defined?(Rails.application) || Rails.application.config.cache_classes
+      !defined?(Rails.application) || Rails.application.config.cache_classes
     end
 
     # This is what child classes implement. No defaults are needed