diff --git a/pkg/infra/distcache/database_storage_integration_test.go b/pkg/infra/distcache/database_storage_integration_test.go
index e305759983d..b8f564f9710 100644
--- a/pkg/infra/distcache/database_storage_integration_test.go
+++ b/pkg/infra/distcache/database_storage_integration_test.go
@@ -4,9 +4,5 @@ import "testing"
 
 func TestIntegrationDatabaseCacheStorage(t *testing.T) {
 
-	client := createTestClient(t, "database")
-
-	CanPutGetAndDeleteCachedObjects(t, client)
-	CanNotFetchExpiredItems(t, client)
-	CanSetInfiniteCacheExpiration(t, client)
+	RunTestsForClient(t, createTestClient(t, "database"))
 }
diff --git a/pkg/infra/distcache/distcache_test.go b/pkg/infra/distcache/distcache_test.go
index ec778b0c335..a40066b788f 100644
--- a/pkg/infra/distcache/distcache_test.go
+++ b/pkg/infra/distcache/distcache_test.go
@@ -26,16 +26,16 @@ func createTestClient(t *testing.T, name string) cacheStorage {
 	return createClient(CacheOpts{name: name}, sqlstore)
 }
 
-func TestAllCacheClients(t *testing.T) {
-	clients := []string{"memory"} // add redis, memcache, memory
+func TestMemoryStorageClient(t *testing.T) {
 
-	for _, v := range clients {
-		client := createTestClient(t, v)
+	client := createTestClient(t, "memory")
+	RunTestsForClient(t, client)
+}
 
-		CanPutGetAndDeleteCachedObjects(t, client)
-		CanNotFetchExpiredItems(t, client)
-		CanSetInfiniteCacheExpiration(t, client)
-	}
+func RunTestsForClient(t *testing.T, client cacheStorage) {
+	CanPutGetAndDeleteCachedObjects(t, client)
+	CanNotFetchExpiredItems(t, client)
+	CanSetInfiniteCacheExpiration(t, client)
 }
 
 func CanPutGetAndDeleteCachedObjects(t *testing.T, client cacheStorage) {
diff --git a/pkg/infra/distcache/memcached_storage.go b/pkg/infra/distcache/memcached_storage.go
index 1186bef626b..7f97a043628 100644
--- a/pkg/infra/distcache/memcached_storage.go
+++ b/pkg/infra/distcache/memcached_storage.go
@@ -35,7 +35,7 @@ func (s *memcacheStorage) Put(key string, val interface{}, expires time.Duration
 
 	memcacheItem := newItem(key, bytes, int32(expires))
 
-	return s.c.Add(memcacheItem)
+	return s.c.Set(memcacheItem)
 }
 
 // Get gets value by given key in the cache.
diff --git a/pkg/infra/distcache/memcached_storage_test.go b/pkg/infra/distcache/memcached_storage_test.go
index b02f67f062f..524a4fcea10 100644
--- a/pkg/infra/distcache/memcached_storage_test.go
+++ b/pkg/infra/distcache/memcached_storage_test.go
@@ -3,10 +3,5 @@ package distcache
 import "testing"
 
 func TestMemcachedCacheStorage(t *testing.T) {
-
-	client := createTestClient(t, "memcache")
-
-	CanPutGetAndDeleteCachedObjects(t, client)
-	CanNotFetchExpiredItems(t, client)
-	CanSetInfiniteCacheExpiration(t, client)
+	RunTestsForClient(t, createTestClient(t, "memcache"))
 }
diff --git a/pkg/infra/distcache/redis_storage_test.go b/pkg/infra/distcache/redis_storage_test.go
index 39d39d41b12..6ba093a205c 100644
--- a/pkg/infra/distcache/redis_storage_test.go
+++ b/pkg/infra/distcache/redis_storage_test.go
@@ -3,10 +3,5 @@ package distcache
 import "testing"
 
 func TestRedisCacheStorage(t *testing.T) {
-
-	client := createTestClient(t, "redis")
-
-	CanPutGetAndDeleteCachedObjects(t, client)
-	CanNotFetchExpiredItems(t, client)
-	CanSetInfiniteCacheExpiration(t, client)
+	RunTestsForClient(t, createTestClient(t, "redis"))
 }