diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
index 8320b9b2576..753a5a11070 100644
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
@@ -1,6 +1,11 @@
 namespace :cache do
   desc "GITLAB | Clear redis cache"
   task :clear => :environment do
-    Rails.cache.clear
+    # Hack into Rails.cache until https://github.com/redis-store/redis-store/pull/225
+    # is accepted (I hope) and we can update the redis-store gem.
+    redis_store = Rails.cache.instance_variable_get(:@data)
+    redis_store.keys.each_slice(1000) do |key_slice|
+      redis_store.del(*key_slice)
+    end
   end
 end