diff --git a/cmd/cache/add.go b/cmd/cache/add.go
index 83e4fac084..b97f5f2197 100644
--- a/cmd/cache/add.go
+++ b/cmd/cache/add.go
@@ -36,7 +36,7 @@ var addCmd = &cobra.Command{
 	- S3`,
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println(color.YellowString("Adding remote S3 based cache"))
-		err := cache.AddCache(bucketname, region)
+		err := cache.AddRemoteCache(bucketname, region)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
diff --git a/cmd/cache/remove.go b/cmd/cache/remove.go
index dd952c46ac..56fd5b73cd 100644
--- a/cmd/cache/remove.go
+++ b/cmd/cache/remove.go
@@ -29,7 +29,7 @@ var removeCmd = &cobra.Command{
 	Long:  `This command allows you to remove the remote cache and use the default filecache.`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		err := cache.RemoveCache(bucketname)
+		err := cache.RemoveRemoteCache(bucketname)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
index b8492909a7..f004fc9633 100644
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@@ -42,7 +42,7 @@ func RemoteCacheEnabled() (bool, error) {
 	return false, nil
 }
 
-func AddCache(bucketName string, region string) error {
+func AddRemoteCache(bucketName string, region string) error {
 	var cacheInfo CacheProvider
 	err := viper.UnmarshalKey("cache", &cacheInfo)
 	if err != nil {
@@ -61,7 +61,7 @@ func AddCache(bucketName string, region string) error {
 	return nil
 }
 
-func RemoveCache(bucketName string) error {
+func RemoveRemoteCache(bucketName string) error {
 	var cacheInfo CacheProvider
 	err := viper.UnmarshalKey("cache", &cacheInfo)
 	if err != nil {
diff --git a/pkg/server/config.go b/pkg/server/config.go
index 92ca616b7c..0d6cf7edb3 100644
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -14,7 +14,7 @@ func (h *handler) AddConfig(ctx context.Context, i *schemav1.AddConfigRequest) (
 		return nil, errors.New("BucketName & Region are required")
 	}
 
-	err := cache.AddCache(i.Cache.BucketName, i.Cache.Region)
+	err := cache.AddRemoteCache(i.Cache.BucketName, i.Cache.Region)
 	if err != nil {
 		return &schemav1.AddConfigResponse{}, err
 	}
@@ -26,7 +26,7 @@ func (h *handler) AddConfig(ctx context.Context, i *schemav1.AddConfigRequest) (
 
 func (h *handler) RemoveConfig(ctx context.Context, i *schemav1.RemoveConfigRequest) (*schemav1.RemoveConfigResponse, error,
 ) {
-	err := cache.RemoveCache(i.Cache.BucketName)
+	err := cache.RemoveRemoteCache(i.Cache.BucketName)
 	if err != nil {
 		return &schemav1.RemoveConfigResponse{}, err
 	}