diff --git a/lib/annotate_rb/model_annotator/model_wrapper.rb b/lib/annotate_rb/model_annotator/model_wrapper.rb
index 3a8fe146..c576fac6 100644
--- a/lib/annotate_rb/model_annotator/model_wrapper.rb
+++ b/lib/annotate_rb/model_annotator/model_wrapper.rb
@@ -44,7 +44,10 @@ def database_name
 
       # Returns the unmodified model columns
       def raw_columns
-        @raw_columns ||= @klass.columns
+        @raw_columns ||= begin
+          @klass.load_schema
+          @klass.schema_cache.columns_hash(@klass.table_name).values.freeze
+        end
       end
 
       def primary_key