diff --git a/actionpack/lib/action_view/inline_template.rb b/actionpack/lib/action_view/inline_template.rb
index fb5e4408db..965df96e3b 100644
--- a/actionpack/lib/action_view/inline_template.rb
+++ b/actionpack/lib/action_view/inline_template.rb
@@ -2,10 +2,6 @@ module ActionView #:nodoc:
   class InlineTemplate #:nodoc:
     include Renderable
 
-    # Count the number of inline templates
-    cattr_accessor :inline_template_count
-    @@inline_template_count = 0
-
     def initialize(view, source, locals = {}, type = nil)
       @view = view
 
@@ -13,14 +9,13 @@ module ActionView #:nodoc:
       @extension = type
       @locals = locals || {}
 
-      @method_key = @source
+      @method_key = "inline_#{@source.hash.abs}"
       @handler = Template.handler_class_for_extension(@extension).new(@view)
     end
 
     private
-      # FIXME: Modifying this shared variable may not thread safe
       def method_name_path_segment
-        "inline_#{@@inline_template_count += 1}"
+        @method_key
       end
   end
 end