1 files changed, 8 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/current_attributes.rb b/activesupport/lib/active_support/current_attributes.rb
index 9921241c23..872b0663c7 100644
--- a/activesupport/lib/active_support/current_attributes.rb
+++ b/activesupport/lib/active_support/current_attributes.rb
@@ -87,9 +87,7 @@ module ActiveSupport
     class << self
       # Returns singleton instance for this class in this thread. If none exists, one is created.
       def instance
-        Thread.current[:"current_attributes_for_#{name}"] ||= new.tap do |instance|
-          current_instances << instance
-        end
+        current_instances[name] ||= new
       end
 
       # Declares one or more attributes that will be given both class and instance accessor methods.
@@ -125,7 +123,12 @@ module ActiveSupport
       delegate :set, :reset, to: :instance
 
       def reset_all # :nodoc:
-        current_instances.each(&:reset)
+        current_instances.each_value(&:reset)
+      end
+
+      def clear_all # :nodoc:
+        reset_all
+        current_instances.clear
       end
 
       private
@@ -134,7 +137,7 @@ module ActiveSupport
         end
 
         def current_instances
-          Thread.current[:current_attributes_instances] ||= []
+          Thread.current[:current_attributes_instances] ||= {}
         end
 
         def method_missing(name, *args, &block)