Move attribute casting to #cached_attribute

1 files changed, 3 insertions, 4 deletions

diff --git a/app/models/concerns/redis_cacheable.rb b/app/models/concerns/redis_cacheable.rb
index 4fdaaddeee7..d40df5ba2d4 100644
--- a/app/models/concerns/redis_cacheable.rb
+++ b/app/models/concerns/redis_cacheable.rb
@@ -8,16 +8,15 @@ module RedisCacheable
     def cached_attr_reader(*attributes)
       attributes.each do |attribute|
         define_method(attribute) do
-          cached_value = cached_attribute(attribute)
-          cached_value = cast_value_from_cache(attribute, cached_value) if cached_value
-          cached_value || read_attribute(attribute)
+          cached_attribute(attribute) || read_attribute(attribute)
         end
       end
     end
   end
 
   def cached_attribute(attribute)
-    (cached_attributes || {})[attribute]
+    cached_value = (cached_attributes || {})[attribute]
+    cast_value_from_cache(attribute, cached_value) if cached_value
   end
 
   def cache_attributes(values)