diff --git a/apps/ensapi/src/omnigraph-api/schema/scalars.ts b/apps/ensapi/src/omnigraph-api/schema/scalars.ts
index 2c15fc90c6..c5597e9ed8 100644
--- a/apps/ensapi/src/omnigraph-api/schema/scalars.ts
+++ b/apps/ensapi/src/omnigraph-api/schema/scalars.ts
@@ -1,12 +1,12 @@
 import {
-  asInterpretedLabel,
-  asInterpretedName,
   type BeautifiedLabel,
   type BeautifiedName,
   type ChainId,
   type CoinType,
   type DomainId,
   type Hex,
+  type InterpretedLabel,
+  type InterpretedName,
   isInterpretedLabel,
   isInterpretedName,
   type Name,
@@ -110,7 +110,7 @@ builder.scalarType("InterpretedName", {
           });
         }
       })
-      .transform((val) => asInterpretedName(val))
+      .transform((val) => val as InterpretedName)
       .parse(value),
 });
 
@@ -129,7 +129,7 @@ builder.scalarType("InterpretedLabel", {
           });
         }
       })
-      .transform((val) => asInterpretedLabel(val))
+      .transform((val) => val as InterpretedLabel)
       .parse(value),
 });
 
diff --git a/packages/enskit/src/react/omnigraph/_lib/cache-exchange.ts b/packages/enskit/src/react/omnigraph/_lib/cache-exchange.ts
index 6d890670b8..490a043df0 100644
--- a/packages/enskit/src/react/omnigraph/_lib/cache-exchange.ts
+++ b/packages/enskit/src/react/omnigraph/_lib/cache-exchange.ts
@@ -40,6 +40,9 @@ export const omnigraphCacheExchange = cacheExchange({
     // These entities are Embedded Data and don't have a relevant key
     Label: EMBEDDED_DATA,
     WrappedBaseRegistrarRegistration: EMBEDDED_DATA,
+    CanonicalName: EMBEDDED_DATA,
+    DomainCanonical: EMBEDDED_DATA,
+    DomainResolver: EMBEDDED_DATA,
   },
   resolvers: mergeResolverMaps(
     // produce relayPagination() local resolvers for each t.connection in the schema