diff --git a/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts b/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts
index 3c71a3d662..58d7d03761 100644
--- a/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts
+++ b/plugins/techdocs-backend/src/service/CachedEntityLoader.test.ts
@@ -80,7 +80,7 @@ describe('CachedEntityLoader', () => {
 
     expect(result).toEqual(entity);
     expect(cache.set).toBeCalledWith(
-      'component:default/test:user:default/test-user',
+      'catalog:component:default/test:user:default/test-user',
       entity,
       { ttl: 5000 },
     );
@@ -126,7 +126,7 @@ describe('CachedEntityLoader', () => {
     const result = await loader.load(entityName, undefined);
 
     expect(result).toEqual(entity);
-    expect(cache.set).toBeCalledWith('component:default/test', entity, {
+    expect(cache.set).toBeCalledWith('catalog:component:default/test', entity, {
       ttl: 5000,
     });
   });
diff --git a/plugins/techdocs-backend/src/service/CachedEntityLoader.ts b/plugins/techdocs-backend/src/service/CachedEntityLoader.ts
index 4e59ccd535..b65f51b4ab 100644
--- a/plugins/techdocs-backend/src/service/CachedEntityLoader.ts
+++ b/plugins/techdocs-backend/src/service/CachedEntityLoader.ts
@@ -82,14 +82,14 @@ export class CachedEntityLoader {
     entityName: EntityName,
     token: string | undefined,
   ): Promise<string> {
-    const entityRef = stringifyEntityRef(entityName);
+    const key = ['catalog'];
+    key.push(stringifyEntityRef(entityName));
 
-    if (!token) {
-      return entityRef;
+    if (token) {
+      const response = await this.identity.authenticate(token);
+      key.push(response.identity.userEntityRef);
     }
 
-    const response = await this.identity.authenticate(token);
-
-    return `${entityRef}:${response.identity.userEntityRef}`;
+    return key.join(':');
   }
 }