Use Redis#mget for RedisCacheStore#fetch_multi

2 files changed, 16 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/cache/redis_cache_store.rb b/activesupport/lib/active_support/cache/redis_cache_store.rb
index c21ade8670..af14c28408 100644
--- a/activesupport/lib/active_support/cache/redis_cache_store.rb
+++ b/activesupport/lib/active_support/cache/redis_cache_store.rb
@@ -307,6 +307,14 @@ module ActiveSupport
           end
         end
 
+        def read_multi_entries(names, _options)
+          if mget_capable?
+            read_multi_mget(*names)
+          else
+            super
+          end
+        end
+
         def read_multi_mget(*names)
           options = names.extract_options!
           options = merged_options(options)
diff --git a/activesupport/test/cache/stores/redis_cache_store_test.rb b/activesupport/test/cache/stores/redis_cache_store_test.rb
index 22b519daf1..9daa0b8796 100644
--- a/activesupport/test/cache/stores/redis_cache_store_test.rb
+++ b/activesupport/test/cache/stores/redis_cache_store_test.rb
@@ -109,6 +109,14 @@ module ActiveSupport::Cache::RedisCacheStoreTests
     include CacheIncrementDecrementBehavior
     include CacheInstrumentationBehavior
     include AutoloadingCacheBehavior
+
+    def test_fetch_multi_uses_redis_mget
+      assert_called(@cache.redis, :mget, returns: []) do
+        @cache.fetch_multi("a", "b", "c") do |key|
+          key * 2
+        end
+      end
+    end
   end
 
   # Separate test class so we can omit the namespace which causes expected,