lib/locomotive/steam/middlewares/cache.rb in locomotivecms-3.0.0 vs lib/locomotive/steam/middlewares/cache.rb in locomotivecms-3.0.1

@@ -45,16 +45,21 @@
         def cacheable?(env)
           CACHEABLE_REQUEST_METHODS.include?(env['REQUEST_METHOD']) &&
           !env['steam.live_editing'] &&
           env['steam.site'].try(:cache_enabled) &&
           env['steam.page'].try(:cache_enabled) &&
-          env['steam.page'].try(:redirect_url).blank?
+          is_redirect_url?(env['steam.page'], env['steam.locale'])
         end
 
         def cache_key(env)
           site, path, query = env['steam.site'], env['PATH_INFO'], env['QUERY_STRING']
           key = "#{Locomotive::VERSION}/site/#{site._id}/#{site.last_modified_at.to_i}/page/#{path}/#{query}"
           Digest::MD5.hexdigest(key)
+        end
+
+        def is_redirect_url?(page, locale)
+          return false if page.nil?
+          (page.try(:redirect_url) || {})[locale].blank?
         end
 
       end
 
     end