Remove more usages

src/kernels/raw/finder/localPythonAndRelatedNonPythonKernelSpecFinder.node.ts

@@ -25,6 +25,8 @@ import {
 } from './interpreterKernelSpecFinderHelper.node';
 import { getDisplayPath } from '../../../platform/common/platform/fs-paths.node';
 import { raceCancellation } from '../../../platform/common/cancellation';
+import { getCachedEnvironments, resolvedPythonEnvToJupyterEnv } from '../../../platform/interpreter/helpers';
+import { resolvableInstance } from '../../../test/datascience/helpers';
 
 type InterpreterId = string;
 
@@ -215,7 +217,8 @@ export class LocalPythonAndRelatedNonPythonKernelSpecFinder extends LocalKernelS
                 // It is also possible the user deleted a python environment,
                 // E.g. user deleted a conda env or a virtual env and they refreshed the list of interpreters/kernels.
                 // We should now remove those kernels as well.
-                const validInterpreterIds = new Set(this.interpreterService.resolvedEnvironments.map((i) => i.id));
+                const validInterpreterIds = new Set(getCachedEnvironments().map((i) => i.id));
+                // const validInterpreterIds = new Set(this.interpreterService.resolvedEnvironments.map((i) => i.id));
                 const kernelsThatPointToInvalidValidInterpreters = Array.from(this._kernels.values()).filter((item) => {
                     if (item.interpreter && !validInterpreterIds.has(item.interpreter.id)) {
                         return true;
@@ -277,15 +280,13 @@ export class LocalPythonAndRelatedNonPythonKernelSpecFinder extends LocalKernelS
     }
 
     private async listKernelsImplementation(cancelToken: CancellationToken, forceRefresh: boolean) {
-        const interpreters = this.extensionChecker.isPythonExtensionInstalled
-            ? this.interpreterService.resolvedEnvironments
-            : [];
+        const interpreters = this.extensionChecker.isPythonExtensionInstalled ? getCachedEnvironments() : [];
         const interpreterPromise = Promise.all(
             interpreters.map(async (interpreter) => {
                 let finder = this.interpreterKernelSpecs.get(interpreter.id);
                 if (!finder) {
                     finder = new InterpreterSpecificKernelSpecsFinder(
-                        interpreter,
+                        resolvedPythonEnvToJupyterEnv(interpreter)!,
                         this.interpreterService,
                         this.jupyterPaths,
                         this.extensionChecker,