Use RequestStore in CacheableAttributes.cached for greater performance

app/models/concerns/cacheable_attributes.rb

@@ -25,8 +25,12 @@ module CacheableAttributes
     end
 
     def cached
+      if RequestStore.active?
+        RequestStore[:"#{name}_cached_attributes"] ||= retrieve_from_cache
+      else
         retrieve_from_cache
       end
+    end
 
     def retrieve_from_cache
       record = Rails.cache.read(cache_key)

spec/models/concerns/cacheable_attributes_spec.rb

@@ -177,6 +177,15 @@ describe CacheableAttributes do
         end
       end
     end
+
+    it 'uses RequestStore in addition to Rails.cache', :request_store do
+      # Warm up the cache
+      create(:application_setting).cache!
+
+      expect(Rails.cache).to receive(:read).with(ApplicationSetting.cache_key).once.and_call_original
+
+      2.times { ApplicationSetting.current }
+    end
   end
 
   describe '.cached', :use_clean_rails_memory_store_caching do