diff --git a/src/resolution/composite-arns-resolver.ts b/src/resolution/composite-arns-resolver.ts
index b9235f19..d91d57f3 100644
--- a/src/resolution/composite-arns-resolver.ts
+++ b/src/resolution/composite-arns-resolver.ts
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import winston from 'winston';
-import { KVBufferStore, NameResolution, NameResolver } from '../types.js';
+import { NameResolution, NameResolver } from '../types.js';
 import * as metrics from '../metrics.js';
 import { KvArnsStore } from '../store/kv-arns-store.js';
 
 export class CompositeArNSResolver implements NameResolver {
   private log: winston.Logger;
   private resolvers: NameResolver[];
-  private cache: KVBufferStore;
+  private cache: KvArnsStore;
 
   constructor({
     log,
@@ -70,7 +70,7 @@ export class CompositeArNSResolver implements NameResolver {
           });
           const resolution = await resolver.resolve(name);
           if (resolution.resolvedId !== undefined) {
-            await this.cache.set(name, Buffer.from(JSON.stringify(resolution)));
+            this.cache.set(name, Buffer.from(JSON.stringify(resolution)));
             this.log.info('Resolved name', { name, resolution });
             return resolution;
           }
diff --git a/src/system.ts b/src/system.ts
index fba134e5..6ca047e7 100644
--- a/src/system.ts
+++ b/src/system.ts
@@ -563,7 +563,7 @@ export const arnsResolverCache = new KvArnsStore({
 
 export const nameResolver = createArNSResolver({
   log,
-  trustedGatewayUrl: config.TRUSTED_GATEWAY_URL,
+  trustedGatewayUrl: config.TRUSTED_ARNS_GATEWAY_URL,
   resolutionOrder: config.ARNS_RESOLVER_PRIORITY_ORDER,
   networkProcess: arIO,
   cache: arnsResolverCache,