1 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/attributes.rb b/activerecord/lib/active_record/attributes.rb
index 9c80121d70..d0287140c8 100644
--- a/activerecord/lib/active_record/attributes.rb
+++ b/activerecord/lib/active_record/attributes.rb
@@ -109,13 +109,14 @@ module ActiveRecord
       end
 
       def clear_caches_calculated_from_columns
-        @columns = nil
-        @columns_hash = nil
-        @column_types = nil
+        @attributes_builder = nil
         @column_defaults = nil
-        @raw_column_defaults = nil
         @column_names = nil
+        @column_types = nil
+        @columns = nil
+        @columns_hash = nil
         @content_columns = nil
+        @raw_column_defaults = nil
       end
     end
   end