Use AS::Concern for caching modules

actionpack/lib/action_controller/caching.rb

@@ -57,13 +57,12 @@ def cache_configured?
     end
 
     include ConfigMethods
+    include Pages, Actions, Fragments
+    include Sweeping if defined?(ActiveRecord)
 
     included do
       extend ConfigMethods
 
-      include Pages, Actions, Fragments
-      include Sweeping if defined?(ActiveRecord)
-
       @@perform_caching = true
       cattr_accessor :perform_caching
     end

actionpack/lib/action_controller/caching/pages.rb

 require 'fileutils'
 require 'uri'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module ActionController #:nodoc:
   module Caching
@@ -34,9 +35,9 @@ module Caching
     # Additionally, you can expire caches using Sweepers that act on changes in the model to determine when a cache is supposed to be
     # expired.
     module Pages
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+      included do
         @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
         ##
         # :singleton-method:
@@ -55,7 +56,6 @@ def self.included(base) #:nodoc:
         # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
         cattr_accessor :page_cache_extension
       end
-      end
 
       module ClassMethods
         # Expires the page that was cached with the +path+ as a key. Example:

actionpack/lib/action_controller/caching/sweeping.rb

@@ -30,9 +30,7 @@ module Caching
     #     cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
     #   end
     module Sweeping
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods #:nodoc:
         def cache_sweeper(*sweepers)