diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index b3fa129929a56da49368ad60b15df781d8974550..0da0ca18931522e93b822c1373524c1165ab4bb1 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -63,8 +63,9 @@ def cache_configured?
     included do
       extend ConfigMethods
 
-      @@perform_caching = true
-      cattr_accessor :perform_caching
+      delegate :perform_caching, :perform_caching=, :to => :config
+      singleton_class.delegate :perform_caching, :perform_caching=, :to => :config
+      self.perform_caching = true
     end