diff --git a/cache/multi_repo_cache.go b/cache/multi_repo_cache.go
index 726558d9b763a795f3b68f852ecfad7e2c58fb5f..659cd5e6566f97992b4e6eb7e0c20f7ad30dd89d 100644
--- a/cache/multi_repo_cache.go
+++ b/cache/multi_repo_cache.go
@@ -7,6 +7,7 @@ import (
 )
 
 const lockfile = "lock"
+const defaultRepoName = "__default"
 
 // MultiRepoCache is the root cache, holding multiple RepoCache.
 type MultiRepoCache struct {
@@ -37,7 +38,7 @@ func (c *MultiRepoCache) RegisterDefaultRepository(repo repository.ClockedRepo)
 		return nil, err
 	}
 
-	c.repos[""] = r
+	c.repos[defaultRepoName] = r
 	return r, nil
 }
 
diff --git a/webui/src/apollo.ts b/webui/src/apollo.ts
index c111dbd8e0bef9b0079a9ed365cbce35b8373845..3482df5410d1b7831d85598d4fd03aeb26f78177 100644
--- a/webui/src/apollo.ts
+++ b/webui/src/apollo.ts
@@ -9,7 +9,7 @@ const client = new ApolloClient({
     typePolicies: {
       // TODO: For now, we only query the default repository, so consider it as a singleton
       Repository: {
-        keyFields: [],
+        keyFields: ['name'],
       },
     },
   }),