1 files changed, 20 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 49cf70ec21..271d5f06b8 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -1,6 +1,6 @@
 module ActionController #:nodoc:
   module Caching
-    # Sweepers are the terminators of the caching world and responsible for expiring caches when model objects change.
+    # Sweepers are the terminators of the caching world and responsible for expiring caches when Active Record objects change.
     # They do this by being half-observers, half-filters and implementing callbacks for both roles. A Sweeper example:
     #
     #   class ListSweeper < ActionController::Caching::Sweeper
@@ -54,6 +54,11 @@ module ActionController #:nodoc:
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller
 
+        def initialize(*args)
+          super
+          @controller = nil
+        end
+
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
@@ -63,8 +68,14 @@ module ActionController #:nodoc:
         def after(controller)
           self.controller = controller
           callback(:after) if controller.perform_caching
-          # Clean up, so that the controller can be collected after this request
-          self.controller = nil
+        end
+
+        def around(controller)
+          before(controller)
+          yield
+          after(controller)
+        ensure
+          clean_up
         end
 
         protected
@@ -79,6 +90,11 @@ module ActionController #:nodoc:
           end
 
         private
+          def clean_up
+            # Clean up, so that the controller can be collected after this request
+            self.controller = nil
+          end
+
           def callback(timing)
             controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
             action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
@@ -88,7 +104,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return unless @controller
+            return super unless @controller
             @controller.__send__(method, *arguments, &block)
           end
       end