From c9b0e4e6aeb79b7c4f0a8d80c069df95258fc54c Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Sun, 30 Apr 2017 23:00:40 -0500 Subject: [PATCH] Do not calculate cache_key unless caching --- lib/active_model/serializer/concerns/caching.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/active_model/serializer/concerns/caching.rb b/lib/active_model/serializer/concerns/caching.rb index 1de86246..2a030b68 100644 --- a/lib/active_model/serializer/concerns/caching.rb +++ b/lib/active_model/serializer/concerns/caching.rb @@ -226,8 +226,9 @@ module ActiveModel end end - def fetch(adapter_instance, cache_options = serializer_class._cache_options, key = cache_key(adapter_instance)) + def fetch(adapter_instance, cache_options = serializer_class._cache_options, key = nil) if serializer_class.cache_store + key ||= cache_key(adapter_instance) serializer_class.cache_store.fetch(key, cache_options) do yield end