diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index 6718a92..d55f3c6 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -17,14 +17,9 @@ module ActiveRecord
   module IdentityMap
     extend ActiveSupport::Concern

+    @enabled = false
     class << self
-      def enabled=(flag)
-        Thread.current[:identity_map_enabled] = flag
-      end
-
-      def enabled
-        Thread.current[:identity_map_enabled]
-      end
+      attr_accessor :enabled
       alias enabled? enabled

       def repository