2 files changed, 12 insertions, 11 deletions
diff --git a/actionpack/lib/action_view/template_handler.rb b/actionpack/lib/action_view/template_handler.rb
index d4892eccd3..70fa02674f 100644
--- a/actionpack/lib/action_view/template_handler.rb
+++ b/actionpack/lib/action_view/template_handler.rb
@@ -1,16 +1,5 @@
 module ActionView
   class TemplateHandler
-    # Map method names to their compile time
-    cattr_accessor :compile_time
-    @@compile_time = {}
-
-    # Map method names to the names passed in local assigns so far
-    cattr_accessor :template_args
-    @@template_args = {}
-
-    # Count the number of inline templates
-    cattr_accessor :inline_template_count
-    @@inline_template_count = 0
 
     def self.line_offset
       0
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
index e4a36b8d15..6ab4f69558 100644
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -4,6 +4,18 @@ module ActionView
 
       def self.included(base)
         base.extend ClassMethod
+
+        # Map method names to their compile time
+        base.cattr_accessor :compile_time
+        base.compile_time = {}
+
+        # Map method names to the names passed in local assigns so far
+        base.cattr_accessor :template_args
+        base.template_args = {}
+
+        # Count the number of inline templates
+        base.cattr_accessor :inline_template_count
+        base.inline_template_count = 0
       end
 
       module ClassMethod