diff --git a/conf/defaults.ini b/conf/defaults.ini
index d77f980f806..3386e552b8a 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -108,7 +108,7 @@ cache_mode = private
 
 #################################### Cache server #############################
 [cache_server]
-# Either "memory", "redis", "memcache" or "database" default is "database"
+# Either "memory", "redis", "memcached" or "database" default is "database"
 type = database
 
 # cache connectionstring options
diff --git a/pkg/infra/distcache/distcache.go b/pkg/infra/distcache/distcache.go
index 44ab2e08583..c293b62f608 100644
--- a/pkg/infra/distcache/distcache.go
+++ b/pkg/infra/distcache/distcache.go
@@ -36,8 +36,8 @@ func createClient(opts *setting.CacheOpts, sqlstore *sqlstore.SqlStore) cacheSto
 		return newRedisStorage(opts)
 	}
 
-	if opts.Name == "memcache" {
-		return newMemcacheStorage(opts)
+	if opts.Name == "memcached" {
+		return newMemcachedStorage(opts)
 	}
 
 	return newDatabaseCache(sqlstore)
diff --git a/pkg/infra/distcache/memcached_storage.go b/pkg/infra/distcache/memcached_storage.go
index df1346bf350..ea326d759b7 100644
--- a/pkg/infra/distcache/memcached_storage.go
+++ b/pkg/infra/distcache/memcached_storage.go
@@ -7,12 +7,12 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-type memcacheStorage struct {
+type memcachedStorage struct {
 	c *memcache.Client
 }
 
-func newMemcacheStorage(opts *setting.CacheOpts) *memcacheStorage {
-	return &memcacheStorage{
+func newMemcachedStorage(opts *setting.CacheOpts) *memcachedStorage {
+	return &memcachedStorage{
 		c: memcache.New(opts.ConnStr),
 	}
 }
@@ -26,7 +26,7 @@ func newItem(sid string, data []byte, expire int32) *memcache.Item {
 }
 
 // Put sets value to given key in the cache.
-func (s *memcacheStorage) Put(key string, val interface{}, expires time.Duration) error {
+func (s *memcachedStorage) Put(key string, val interface{}, expires time.Duration) error {
 	item := &cachedItem{Val: val}
 
 	bytes, err := encodeGob(item)
@@ -40,7 +40,7 @@ func (s *memcacheStorage) Put(key string, val interface{}, expires time.Duration
 }
 
 // Get gets value by given key in the cache.
-func (s *memcacheStorage) Get(key string) (interface{}, error) {
+func (s *memcachedStorage) Get(key string) (interface{}, error) {
 	i, err := s.c.Get(key)
 
 	if err != nil && err.Error() == "memcache: cache miss" {
@@ -62,6 +62,6 @@ func (s *memcacheStorage) Get(key string) (interface{}, error) {
 }
 
 // Delete delete a key from the cache
-func (s *memcacheStorage) Delete(key string) error {
+func (s *memcachedStorage) Delete(key string) error {
 	return s.c.Delete(key)
 }
diff --git a/pkg/infra/distcache/memcached_storage_integration_test.go b/pkg/infra/distcache/memcached_storage_integration_test.go
index 128abb6923f..125bf8d2bf1 100644
--- a/pkg/infra/distcache/memcached_storage_integration_test.go
+++ b/pkg/infra/distcache/memcached_storage_integration_test.go
@@ -9,6 +9,6 @@ import (
 )
 
 func TestMemcachedCacheStorage(t *testing.T) {
-	opts := &setting.CacheOpts{Name: "memcache", ConnStr: "localhost:11211"}
+	opts := &setting.CacheOpts{Name: "memcached", ConnStr: "localhost:11211"}
 	runTestsForClient(t, createTestClient(t, opts, nil))
 }