2 files changed, 26 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 9db0366c46..9746a46d47 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -3015,7 +3015,7 @@ module ActiveRecord #:nodoc:
   end
 
   Base.class_eval do
-    extend QueryCache
+    extend QueryCache::ClassMethods
     include Validations
     include Locking::Optimistic, Locking::Pessimistic
     include AttributeMethods
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index a8af89fcb9..eb92bc2545 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -1,20 +1,32 @@
 module ActiveRecord
-  module QueryCache
-    # Enable the query cache within the block if Active Record is configured.
-    def cache(&block)
-      if ActiveRecord::Base.configurations.blank?
-        yield
-      else
-        connection.cache(&block)
+  class QueryCache
+    module ClassMethods
+      # Enable the query cache within the block if Active Record is configured.
+      def cache(&block)
+        if ActiveRecord::Base.configurations.blank?
+          yield
+        else
+          connection.cache(&block)
+        end
       end
+
+      # Disable the query cache within the block if Active Record is configured.
+      def uncached(&block)
+        if ActiveRecord::Base.configurations.blank?
+          yield
+        else
+          connection.uncached(&block)
+        end
+      end
+    end
+
+    def initialize(app)
+      @app = app
     end
 
-    # Disable the query cache within the block if Active Record is configured.
-    def uncached(&block)
-      if ActiveRecord::Base.configurations.blank?
-        yield
-      else
-        connection.uncached(&block)
+    def call(env)
+      ActiveRecord::Base.cache do
+        @app.call(env)
       end
     end
   end