1 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
index 19e596a144..db95ae0db5 100644
--- a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
+++ b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/module/attribute_accessors'
+require "active_support/core_ext/module/attribute_accessors"
 
 module DateAndTime
   module Compatibility
@@ -12,7 +12,11 @@ module DateAndTime
     mattr_accessor(:preserve_timezone, instance_writer: false) { false }
 
     def to_time
-      preserve_timezone ? getlocal(utc_offset) : getlocal
+      if preserve_timezone
+        @_to_time_with_instance_offset ||= getlocal(utc_offset)
+      else
+        @_to_time_with_system_offset ||= getlocal
+      end
     end
   end
 end