diff --git a/packages/js/client/src/PolywrapClient.ts b/packages/js/client/src/PolywrapClient.ts
index bef4a10987..d9940f43af 100644
--- a/packages/js/client/src/PolywrapClient.ts
+++ b/packages/js/client/src/PolywrapClient.ts
@@ -1,5 +1,4 @@
 import { getDefaultClientConfig } from "./default-client-config";
-import { SimpleCache } from "./cache/SimpleWrapperCache";
 
 import { v4 as uuid } from "uuid";
 import {
@@ -46,6 +45,7 @@ import {
   PluginPackage,
   RunOptions,
   GetManifestOptions,
+  SimpleCache,
 } from "@polywrap/core-js";
 import { msgpackEncode, msgpackDecode } from "@polywrap/msgpack-js";
 import { WrapManifest } from "@polywrap/wrap-manifest-types-js";
@@ -97,11 +97,13 @@ export class PolywrapClient implements Client {
 
         if (config.wrapperCache) {
           this._wrapperCache = config.wrapperCache;
-        } else {
-          this._wrapperCache = new SimpleCache();
         }
       }
 
+      if (!this._wrapperCache) {
+        this._wrapperCache = new SimpleCache();
+      }
+
       if (!options?.noDefaults) {
         this._addDefaultConfig();
       }
diff --git a/packages/js/client/src/index.ts b/packages/js/client/src/index.ts
index 91b5c1339a..8f11efe203 100644
--- a/packages/js/client/src/index.ts
+++ b/packages/js/client/src/index.ts
@@ -3,5 +3,4 @@ export * from "./createPolywrapClient";
 export * from "./default-client-config";
 export * from "./wasm";
 export * from "./plugin";
-export * from "./cache";
 export * from "@polywrap/core-js";
diff --git a/packages/js/core/src/__tests__/resolveUri.spec.ts b/packages/js/core/src/__tests__/resolveUri.spec.ts
index 839a95892c..2d6d06a96b 100644
--- a/packages/js/core/src/__tests__/resolveUri.spec.ts
+++ b/packages/js/core/src/__tests__/resolveUri.spec.ts
@@ -23,6 +23,8 @@ import {
   SubscribeOptions,
   Subscription,
   PluginPackage,
+  SimpleCache,
+  GetManifestOptions,
 } from "..";
 
 import { WrapManifest } from "@polywrap/wrap-manifest-types-js";
@@ -106,7 +108,7 @@ describe("resolveUri", () => {
           encoded: false
         }),
       getFile: (options: GetFileOptions, client: Client) => Promise.resolve(""),
-      getManifest: (client: Client) => Promise.resolve({} as WrapManifest)
+      getManifest: (options: GetManifestOptions, client: Client) => Promise.resolve({} as WrapManifest)
     };
   };
 
@@ -238,7 +240,7 @@ describe("resolveUri", () => {
       new Uri("ens/test.eth"),
       uriResolvers,
       client(wrappers, plugins, interfaces),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(result.wrapper).toBeTruthy();
@@ -260,7 +262,7 @@ describe("resolveUri", () => {
       new Uri("my/something-different"),
       uriResolvers,
       client(wrappers, plugins, interfaces),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(result.wrapper).toBeTruthy();
@@ -282,7 +284,7 @@ describe("resolveUri", () => {
       new Uri("ens/ens"),
       uriResolvers,
       client(wrappers, plugins, interfaces),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(result.wrapper).toBeTruthy();
@@ -304,7 +306,7 @@ describe("resolveUri", () => {
       new Uri("my/something-different"),
       uriResolvers,
       client(wrappers, plugins, interfaces),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(result.wrapper).toBeTruthy();
@@ -339,7 +341,7 @@ describe("resolveUri", () => {
       new Uri("some/wrapper"),
       uriResolvers,
       client(wrappers, plugins, interfaces, circular),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     ).catch((e: Error) =>
       expect(e.message).toMatch(/Infinite loop while resolving URI/)
     );
@@ -363,7 +365,7 @@ describe("resolveUri", () => {
       new Uri("some/wrapper"),
       uriResolvers,
       client(wrappers, plugins, interfaces, missingFromProperty),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     ).catch((e: Error) =>
       expect(e.message).toMatch(
         "Redirect missing the from property.\nEncountered while resolving wrap://some/wrapper"
@@ -387,7 +389,7 @@ describe("resolveUri", () => {
       new Uri("some/wrapper"),
       uriResolvers,
       client(wrappers, pluginRegistrations, interfaces),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(result.wrapper).toBeTruthy();
@@ -425,7 +427,7 @@ describe("resolveUri", () => {
         plugins, 
         interfaces
       ),
-      new Map<string, Wrapper>(),
+      new SimpleCache(),
     );
 
     expect(resolvedUri).toEqual(uri);
diff --git a/packages/js/client/src/cache/SimpleWrapperCache.ts b/packages/js/core/src/cache/SimpleWrapperCache.ts
similarity index 88%
rename from packages/js/client/src/cache/SimpleWrapperCache.ts
rename to packages/js/core/src/cache/SimpleWrapperCache.ts
index 72d2e00368..71948bea40 100644
--- a/packages/js/client/src/cache/SimpleWrapperCache.ts
+++ b/packages/js/core/src/cache/SimpleWrapperCache.ts
@@ -1,4 +1,4 @@
-import { Uri, Wrapper, WrapperCache } from "@polywrap/core-js";
+import { Uri, Wrapper, WrapperCache } from "../types";
 
 export class SimpleCache implements WrapperCache {
   private _map: Map<string, Wrapper> = new Map();
diff --git a/packages/js/client/src/cache/index.ts b/packages/js/core/src/cache/index.ts
similarity index 100%
rename from packages/js/client/src/cache/index.ts
rename to packages/js/core/src/cache/index.ts
diff --git a/packages/js/core/src/index.ts b/packages/js/core/src/index.ts
index 774ca2e6fe..b40a7aeb26 100644
--- a/packages/js/core/src/index.ts
+++ b/packages/js/core/src/index.ts
@@ -1,5 +1,6 @@
 export * from "./types";
 export * from "./algorithms";
+export * from "./cache";
 export * from "./interfaces";
 export * from "./uri-resolution/core";
 export * from "./uri-resolution/resolvers";