diff --git a/src/plugins/discovery.test.ts b/src/plugins/discovery.test.ts
index 53552746bbc..58d1e372b9e 100644
--- a/src/plugins/discovery.test.ts
+++ b/src/plugins/discovery.test.ts
@@ -258,6 +258,7 @@ async function expectRejectedPackageExtensionEntry(params: {
 }
 
 afterEach(() => {
+  vi.restoreAllMocks();
   clearPluginDiscoveryCache();
   cleanupTrackedTempDirs(tempDirs);
 });
diff --git a/src/plugins/discovery.ts b/src/plugins/discovery.ts
index 17111b81858..3232cfbe7e0 100644
--- a/src/plugins/discovery.ts
+++ b/src/plugins/discovery.ts
@@ -102,8 +102,9 @@ function buildScopedDiscoveryCacheKey(params: {
     env: params.env,
   });
   const workspaceKey = roots.workspace ?? "";
+  const bundledRoot = roots.stock ?? "";
   const ownershipUid = params.ownershipUid ?? currentUid();
-  return `scoped::${workspaceKey}::${ownershipUid ?? "none"}::${JSON.stringify(loadPaths)}`;
+  return `scoped::${workspaceKey}::${bundledRoot}::${ownershipUid ?? "none"}::${JSON.stringify(loadPaths)}`;
 }
 
 function buildSharedDiscoveryCacheKey(params: {