From e170bc59d4ba0d335ce86f66296bec71c5018317 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 14 Nov 2023 10:33:54 -0800
Subject: [PATCH] Pull out parts of TI Adapter so we can test that more
 correctly instead of having to copy things (#56387)

---
 src/server/_namespaces/ts.server.ts           |    1 +
 src/server/typingInstallerAdapter.ts          |  250 ++++
 src/server/typingsCache.ts                    |    5 +-
 src/testRunner/unittests/helpers/tsserver.ts  |    6 +-
 .../unittests/helpers/typingsInstaller.ts     |  139 +-
 .../unittests/tsserver/typingsInstaller.ts    |  301 +++-
 src/tsserver/nodeServer.ts                    |  249 +---
 src/typingsInstaller/nodeTypingsInstaller.ts  |   29 +-
 src/typingsInstallerCore/typingsInstaller.ts  |   35 +-
 ...e-is-in-inferred-project-until-imported.js |    4 -
 ...ponds-to-manual-changes-in-node_modules.js |    4 -
 .../projects-already-inside-node_modules.js   |    4 -
 ...-not-remove-scrips-from-InferredProject.js |    4 -
 ...ed-from-two-different-drives-of-windows.js |    4 -
 .../when-projectRootPath-is-not-present.js    |    4 -
 ...esent-but-file-is-not-from-project-root.js |    4 -
 ...ached-when-language-service-is-disabled.js |    6 -
 ...n-if-its-not-the-file-from-same-project.js |    6 -
 ...eInferredProjectPerProjectRoot-is-false.js |    4 -
 ...h-with-useInferredProjectPerProjectRoot.js |    8 -
 ...eference-paths-without-external-project.js |    4 -
 .../dynamic-file-without-external-project.js  |    4 -
 ...Path-is-different-from-currentDirectory.js |    4 -
 .../dynamicFiles/opening-untitled-files.js    |    8 -
 ...e-service-disabled-events-are-triggered.js |    4 -
 ...zyConfiguredProjectsFromExternalProject.js |    4 -
 ...-opened-from-the-external-project-works.js |    4 -
 ...re-jsconfig-creation-watcher-is-invoked.js |    8 -
 ...d-state-is-updated-in-external-projects.js |    4 -
 ...oject-root-with-case-insensitive-system.js |   64 -
 ...project-root-with-case-sensitive-system.js |   64 -
 .../inferred-projects-per-project-root.js     |   16 -
 ...or-inferred-projects-when-set-undefined.js |    4 -
 ...-project-created-while-opening-the-file.js |   14 -
 ...should-support-files-without-extensions.js |    4 -
 ...ting-inferred-project-has-no-root-files.js |    4 -
 ...when-referencing-file-from-another-file.js |    4 -
 ...t-to-2-if-the-project-has-js-root-files.js |    4 -
 .../navTo/should-not-include-type-symbols.js  |    4 -
 .../navTo/should-work-with-Deprecated.js      |    4 -
 ...re-added,-caches-them,-and-watches-them.js |    4 -
 ...ultiple-package.json-files-when-present.js |    4 -
 ...r-deletion,-and-removes-them-from-cache.js |    8 -
 .../handles-empty-package.json.js             |    8 -
 ...-errors-in-json-parsing-of-package.json.js |    8 -
 .../projectErrors/for-external-project.js     |    4 -
 .../projectErrors/for-inferred-project.js     |    4 -
 ...pened-right-after-closing-the-root-file.js |   16 -
 ...ith-typeAcquisition-when-safe-type-list.js |    4 -
 ...ith-mixed-content-are-handled-correctly.js |    4 -
 ...les-excluded-by-a-custom-safe-type-list.js |    4 -
 ...les-excluded-by-a-legacy-safe-type-list.js |    4 -
 ...files-excluded-by-the-default-type-list.js |    4 -
 ...configured-project-that-will-be-removed.js |    4 -
 .../loading-files-with-correct-priority.js    |   10 -
 ...st-for-crash-in-acquireOrUpdateDocument.js |    4 -
 ...e-features-when-the-files-are-too-large.js |    8 -
 ...an-load-typings-that-are-proper-modules.js |    4 -
 .../disable-suggestion-diagnostics.js         |    4 -
 .../resolutionCache/suggestion-diagnostics.js |    4 -
 ...rnal-project-with-skipLibCheck-as-false.js |    4 -
 .../skipLibCheck/jsonly-external-project.js   |    4 -
 .../skipLibCheck/jsonly-inferred-project.js   |   12 -
 ...r-in-configured-js-project-with-tscheck.js |    4 -
 ...rror-in-configured-project-with-tscheck.js |    4 -
 .../reports-semantic-error-with-tscheck.js    |    4 -
 ...eclaration-files-with-skipLibCheck=true.js |    4 -
 .../works-for-simple-JavaScript.js            |    4 -
 .../does-nothing-for-inferred-project.js      |    4 -
 ...ven-for-project-with-ts-check-in-config.js |    4 -
 .../sends-event-for-inferred-project.js       |    8 -
 .../sends-telemetry-for-file-sizes.js         |    4 -
 ...-telemetry-for-typeAcquisition-settings.js |    4 -
 ...-JS-file-is-too-large-to-load-into-text.js |    4 -
 .../does-not-depend-on-extension.js           |    4 -
 .../prefer-typings-in-second-pass.js          |    4 -
 ...ted-if-program-structure-did-not-change.js |    4 -
 ...projects-discover-from-bower_components.js |    8 -
 .../typingsInstaller/configured-projects.js   |    8 -
 .../typingsInstaller/discover-from-bower.js   |    8 -
 ...rom-node_modules-empty-types-has-import.js |    8 -
 .../discover-from-node_modules-empty-types.js |    4 -
 ...scover-from-node_modules-explicit-types.js |    4 -
 .../discover-from-node_modules.js             |    8 -
 .../typingsInstaller/expired-cache-entry.js   |    8 -
 .../external-projects-autoDiscovery.js        |    4 -
 .../external-projects-duplicate-package.js    |    4 -
 .../external-projects-no-type-acquisition.js  |    8 -
 ...ith-disableFilenameBasedTypeAcquisition.js |    4 -
 .../external-projects-type-acquisition.js     |    8 -
 ...ith-disableFilenameBasedTypeAcquisition.js |    4 -
 .../typingsInstaller/inferred-projects.js     |    8 -
 .../install-typings-for-unresolved-imports.js |    8 -
 ...date-the-resolutions-with-trimmed-names.js |   16 -
 .../invalidate-the-resolutions.js             |   16 -
 .../local-module-should-not-be-picked-up.js   |    4 -
 .../typingsInstaller/malformed-packagejson.js |   12 -
 .../typingsInstaller/multiple-projects.js     |   12 -
 .../non-expired-cache-entry.js                |    4 -
 ...mes-from-nonrelative-unresolved-imports.js |    4 -
 .../progress-notification-for-error.js        |    4 -
 .../typingsInstaller/progress-notification.js |    8 -
 ...otPath-is-provided-for-inferred-project.js |    4 -
 ...utions-pointing-to-js-on-typing-install.js |    8 -
 .../typingsInstaller/scoped-name-discovery.js |    8 -
 .../should-handle-node-core-modules.js        |   16 -
 ...d-not-initialize-invaalid-package-names.js |    4 -
 .../typingsInstaller/telemetry-events.js      |    8 -
 .../throttle-delayed-run-install-requests.js  |   16 -
 .../throttle-delayed-typings-to-install.js    |    8 -
 ...n-install-requests-with-defer-refreshed.js | 1039 +++++++++++++
 ...requests-with-defer-while-queuing-again.js | 1316 +++++++++++++++++
 ...heduled-run-install-requests-with-defer.js |  966 ++++++++++++
 ...install-requests-without-reaching-limit.js |  968 ++++++++++++
 ...watching-files-with-network-style-paths.js |   20 -
 115 files changed, 4861 insertions(+), 1195 deletions(-)
 create mode 100644 src/server/typingInstallerAdapter.ts
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-refreshed.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-while-queuing-again.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-without-reaching-limit.js

diff --git a/src/server/_namespaces/ts.server.ts b/src/server/_namespaces/ts.server.ts
index 62b2d8a3b56..deaf2e873c3 100644
--- a/src/server/_namespaces/ts.server.ts
+++ b/src/server/_namespaces/ts.server.ts
@@ -15,3 +15,4 @@ export * from "../moduleSpecifierCache";
 export * from "../packageJsonCache";
 export * from "../session";
 export * from "../scriptVersionCache";
+export * from "../typingInstallerAdapter";
diff --git a/src/server/typingInstallerAdapter.ts b/src/server/typingInstallerAdapter.ts
new file mode 100644
index 00000000000..71f7b9e636e
--- /dev/null
+++ b/src/server/typingInstallerAdapter.ts
@@ -0,0 +1,250 @@
+import {
+    ApplyCodeActionCommandResult,
+    assertType,
+    createQueue,
+    Debug,
+    JsTyping,
+    MapLike,
+    server,
+    SortedReadonlyArray,
+    TypeAcquisition,
+} from "./_namespaces/ts";
+import {
+    ActionInvalidate,
+    ActionPackageInstalled,
+    ActionSet,
+    ActionWatchTypingLocations,
+    BeginInstallTypes,
+    createInstallTypingsRequest,
+    DiscoverTypings,
+    EndInstallTypes,
+    Event,
+    EventBeginInstallTypes,
+    EventEndInstallTypes,
+    EventInitializationFailed,
+    EventTypesRegistry,
+    InitializationFailedResponse,
+    InstallPackageOptionsWithProject,
+    InstallPackageRequest,
+    InvalidateCachedTypings,
+    ITypingsInstaller,
+    Logger,
+    LogLevel,
+    PackageInstalledResponse,
+    Project,
+    ProjectService,
+    protocol,
+    ServerHost,
+    SetTypings,
+    stringifyIndented,
+    TypesRegistryResponse,
+    TypingInstallerRequestUnion,
+} from "./_namespaces/ts.server";
+
+/** @internal */
+export interface TypingsInstallerWorkerProcess {
+    send<T extends TypingInstallerRequestUnion>(rq: T): void;
+}
+
+/** @internal */
+export abstract class TypingsInstallerAdapter implements ITypingsInstaller {
+    protected installer!: TypingsInstallerWorkerProcess;
+    private projectService!: ProjectService;
+    protected activeRequestCount = 0;
+    private requestQueue = createQueue<DiscoverTypings>();
+    private requestMap = new Map<string, DiscoverTypings>(); // Maps project name to newest requestQueue entry for that project
+    /** We will lazily request the types registry on the first call to `isKnownTypesPackageName` and store it in `typesRegistryCache`. */
+    private requestedRegistry = false;
+    private typesRegistryCache: Map<string, MapLike<string>> | undefined;
+
+    // This number is essentially arbitrary.  Processing more than one typings request
+    // at a time makes sense, but having too many in the pipe results in a hang
+    // (see https://github.com/nodejs/node/issues/7657).
+    // It would be preferable to base our limit on the amount of space left in the
+    // buffer, but we have yet to find a way to retrieve that value.
+    private static readonly requestDelayMillis = 100;
+    private packageInstalledPromise: {
+        resolve(value: ApplyCodeActionCommandResult): void;
+        reject(reason: unknown): void;
+    } | undefined;
+
+    constructor(
+        protected readonly telemetryEnabled: boolean,
+        protected readonly logger: Logger,
+        protected readonly host: ServerHost,
+        readonly globalTypingsCacheLocation: string,
+        protected event: Event,
+        private readonly maxActiveRequestCount: number,
+    ) {
+    }
+
+    isKnownTypesPackageName(name: string): boolean {
+        // We want to avoid looking this up in the registry as that is expensive. So first check that it's actually an NPM package.
+        const validationResult = JsTyping.validatePackageName(name);
+        if (validationResult !== JsTyping.NameValidationResult.Ok) {
+            return false;
+        }
+        if (!this.requestedRegistry) {
+            this.requestedRegistry = true;
+            this.installer.send({ kind: "typesRegistry" });
+        }
+        return !!this.typesRegistryCache?.has(name);
+    }
+
+    installPackage(options: InstallPackageOptionsWithProject): Promise<ApplyCodeActionCommandResult> {
+        this.installer.send<InstallPackageRequest>({ kind: "installPackage", ...options });
+        Debug.assert(this.packageInstalledPromise === undefined);
+        return new Promise<ApplyCodeActionCommandResult>((resolve, reject) => {
+            this.packageInstalledPromise = { resolve, reject };
+        });
+    }
+
+    attach(projectService: ProjectService) {
+        this.projectService = projectService;
+        this.installer = this.createInstallerProcess();
+    }
+
+    onProjectClosed(p: Project): void {
+        this.installer.send({ projectName: p.getProjectName(), kind: "closeProject" });
+    }
+
+    enqueueInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void {
+        const request = createInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
+        if (this.logger.hasLevel(LogLevel.verbose)) {
+            this.logger.info(`TIAdapter:: Scheduling throttled operation:${stringifyIndented(request)}`);
+        }
+
+        if (this.activeRequestCount < this.maxActiveRequestCount) {
+            this.scheduleRequest(request);
+        }
+        else {
+            if (this.logger.hasLevel(LogLevel.verbose)) {
+                this.logger.info(`TIAdapter:: Deferring request for: ${request.projectName}`);
+            }
+            this.requestQueue.enqueue(request);
+            this.requestMap.set(request.projectName, request);
+        }
+    }
+
+    handleMessage(response: TypesRegistryResponse | PackageInstalledResponse | SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | InitializationFailedResponse | server.WatchTypingLocations) {
+        if (this.logger.hasLevel(LogLevel.verbose)) {
+            this.logger.info(`TIAdapter:: Received response:${stringifyIndented(response)}`);
+        }
+
+        switch (response.kind) {
+            case EventTypesRegistry:
+                this.typesRegistryCache = new Map(Object.entries(response.typesRegistry));
+                break;
+            case ActionPackageInstalled: {
+                const { success, message } = response;
+                if (success) {
+                    this.packageInstalledPromise!.resolve({ successMessage: message });
+                }
+                else {
+                    this.packageInstalledPromise!.reject(message);
+                }
+                this.packageInstalledPromise = undefined;
+
+                this.projectService.updateTypingsForProject(response);
+
+                // The behavior is the same as for setTypings, so send the same event.
+                this.event(response, "setTypings");
+                break;
+            }
+            case EventInitializationFailed: {
+                const body: protocol.TypesInstallerInitializationFailedEventBody = {
+                    message: response.message,
+                };
+                const eventName: protocol.TypesInstallerInitializationFailedEventName = "typesInstallerInitializationFailed";
+                this.event(body, eventName);
+                break;
+            }
+            case EventBeginInstallTypes: {
+                const body: protocol.BeginInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                };
+                const eventName: protocol.BeginInstallTypesEventName = "beginInstallTypes";
+                this.event(body, eventName);
+                break;
+            }
+            case EventEndInstallTypes: {
+                if (this.telemetryEnabled) {
+                    const body: protocol.TypingsInstalledTelemetryEventBody = {
+                        telemetryEventName: "typingsInstalled",
+                        payload: {
+                            installedPackages: response.packagesToInstall.join(","),
+                            installSuccess: response.installSuccess,
+                            typingsInstallerVersion: response.typingsInstallerVersion,
+                        },
+                    };
+                    const eventName: protocol.TelemetryEventName = "telemetry";
+                    this.event(body, eventName);
+                }
+
+                const body: protocol.EndInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                    success: response.installSuccess,
+                };
+                const eventName: protocol.EndInstallTypesEventName = "endInstallTypes";
+                this.event(body, eventName);
+                break;
+            }
+            case ActionInvalidate: {
+                this.projectService.updateTypingsForProject(response);
+                break;
+            }
+            case ActionSet: {
+                if (this.activeRequestCount > 0) {
+                    this.activeRequestCount--;
+                }
+                else {
+                    Debug.fail("TIAdapter:: Received too many responses");
+                }
+
+                while (!this.requestQueue.isEmpty()) {
+                    const queuedRequest = this.requestQueue.dequeue();
+                    if (this.requestMap.get(queuedRequest.projectName) === queuedRequest) {
+                        this.requestMap.delete(queuedRequest.projectName);
+                        this.scheduleRequest(queuedRequest);
+                        break;
+                    }
+
+                    if (this.logger.hasLevel(LogLevel.verbose)) {
+                        this.logger.info(`TIAdapter:: Skipping defunct request for: ${queuedRequest.projectName}`);
+                    }
+                }
+
+                this.projectService.updateTypingsForProject(response);
+                this.event(response, "setTypings");
+
+                break;
+            }
+            case ActionWatchTypingLocations:
+                this.projectService.watchTypingLocations(response);
+                break;
+            default:
+                assertType<never>(response);
+        }
+    }
+
+    scheduleRequest(request: DiscoverTypings) {
+        if (this.logger.hasLevel(LogLevel.verbose)) {
+            this.logger.info(`TIAdapter:: Scheduling request for: ${request.projectName}`);
+        }
+        this.activeRequestCount++;
+        this.host.setTimeout(
+            () => {
+                if (this.logger.hasLevel(LogLevel.verbose)) {
+                    this.logger.info(`TIAdapter:: Sending request:${stringifyIndented(request)}`);
+                }
+                this.installer.send(request);
+            },
+            TypingsInstallerAdapter.requestDelayMillis,
+            `${request.projectName}::${request.kind}`,
+        );
+    }
+
+    protected abstract createInstallerProcess(): TypingsInstallerWorkerProcess;
+}
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
index 6f905fce17b..726006c6cdf 100644
--- a/src/server/typingsCache.ts
+++ b/src/server/typingsCache.ts
@@ -157,7 +157,8 @@ export class TypingsCache {
     }
 
     onProjectClosed(project: Project) {
-        this.perProjectCache.delete(project.getProjectName());
-        this.installer.onProjectClosed(project);
+        if (this.perProjectCache.delete(project.getProjectName())) {
+            this.installer.onProjectClosed(project);
+        }
     }
 }
diff --git a/src/testRunner/unittests/helpers/tsserver.ts b/src/testRunner/unittests/helpers/tsserver.ts
index afe58b1c02d..3cc6a9d9c1c 100644
--- a/src/testRunner/unittests/helpers/tsserver.ts
+++ b/src/testRunner/unittests/helpers/tsserver.ts
@@ -12,7 +12,7 @@ import {
 } from "./solutionBuilder";
 import {
     customTypesMap,
-    TestTypingsInstaller,
+    TestTypingsInstallerAdapter,
     TestTypingsInstallerOptions,
 } from "./typingsInstaller";
 import {
@@ -103,13 +103,13 @@ export class TestSession extends ts.server.Session {
     private seq = 0;
     public override host!: TestSessionAndServiceHost;
     public override logger!: LoggerWithInMemoryLogs;
-    public override readonly typingsInstaller!: TestTypingsInstaller;
+    public override readonly typingsInstaller!: TestTypingsInstallerAdapter;
     public serverCancellationToken: TestServerCancellationToken;
 
     constructor(optsOrHost: TestSessionConstructorOptions) {
         const opts = getTestSessionPartialOptionsAndHost(optsOrHost);
         opts.logger = opts.logger || createLoggerWithInMemoryLogs(opts.host);
-        const typingsInstaller = !opts.disableAutomaticTypingAcquisition ? new TestTypingsInstaller(opts) : undefined;
+        const typingsInstaller = !opts.disableAutomaticTypingAcquisition ? new TestTypingsInstallerAdapter(opts) : undefined;
         const cancellationToken = opts.useCancellationToken ?
             new TestServerCancellationToken(
                 opts.logger,
diff --git a/src/testRunner/unittests/helpers/typingsInstaller.ts b/src/testRunner/unittests/helpers/typingsInstaller.ts
index 8553c20c727..6c683f2c68f 100644
--- a/src/testRunner/unittests/helpers/typingsInstaller.ts
+++ b/src/testRunner/unittests/helpers/typingsInstaller.ts
@@ -4,12 +4,6 @@ import {
 } from "../../../harness/tsserverLogger";
 import * as ts from "../../_namespaces/ts";
 import {
-    ActionInvalidate,
-    ActionPackageInstalled,
-    ActionSet,
-    ActionWatchTypingLocations,
-    EventBeginInstallTypes,
-    EventEndInstallTypes,
     stringifyIndented,
 } from "../../_namespaces/ts.server";
 import {
@@ -91,7 +85,7 @@ export type PendingInstallCallback = (
 ) => void;
 export class TestTypingsInstallerWorker extends ts.server.typingsInstaller.TypingsInstaller {
     readonly typesRegistry: Map<string, ts.MapLike<string>>;
-    constructor(readonly testTypingInstaller: TestTypingsInstaller) {
+    constructor(readonly testTypingInstaller: TestTypingsInstallerAdapter) {
         const log = loggerToTypingsInstallerLog(testTypingInstaller.session.logger);
         ts.Debug.assert(testTypingInstaller.session.host.patched);
         testTypingInstaller.session.host.baselineHost("TI:: Creating typing installer");
@@ -175,17 +169,7 @@ export class TestTypingsInstallerWorker extends ts.server.typingsInstaller.Typin
 
     sendResponse(response: ts.server.SetTypings | ts.server.InvalidateCachedTypings | ts.server.BeginInstallTypes | ts.server.EndInstallTypes | ts.server.WatchTypingLocations | ts.server.PackageInstalledResponse) {
         this.log.writeLine(`Sending response:${stringifyIndented(response)}`);
-        this.testTypingInstaller.onResponse(response);
-    }
-
-    enqueueInstallTypingsRequest(project: ts.server.Project, typeAcquisition: ts.TypeAcquisition, unresolvedImports: ts.SortedReadonlyArray<string>) {
-        const request = ts.server.createInstallTypingsRequest(
-            project,
-            typeAcquisition,
-            unresolvedImports,
-            this.testTypingInstaller.globalTypingsCacheLocation,
-        );
-        this.install(request);
+        this.testTypingInstaller.handleMessage(response);
     }
 }
 
@@ -196,111 +180,50 @@ export interface TestTypingsInstallerOptions {
     throttleLimit?: number;
     installAction?: InstallAction;
     typesRegistry?: string | readonly string[];
+    throttledRequests?: number;
 }
 
-export class TestTypingsInstaller implements ts.server.ITypingsInstaller {
-    protected projectService!: ts.server.ProjectService;
-    public installer!: TestTypingsInstallerWorker;
+export class TestTypingsInstallerAdapter extends ts.server.TypingsInstallerAdapter {
+    worker: TestTypingsInstallerWorker | undefined;
     session!: TestSession;
-    packageInstalledPromise: { resolve(value: ts.ApplyCodeActionCommandResult): void; reject(reason: unknown): void; } | undefined;
-
     // Options
-    readonly globalTypingsCacheLocation: string;
     readonly throttleLimit: number;
     readonly installAction: InstallAction;
     readonly typesRegistry: string | readonly string[] | undefined;
+    readonly throttledRequests: number | undefined;
 
     constructor(options: TestTypingsInstallerOptions) {
-        this.globalTypingsCacheLocation = options.globalTypingsCacheLocation || options.host.getHostSpecificPath("/a/data");
+        const globalTypingsCacheLocation = options.globalTypingsCacheLocation || options.host.getHostSpecificPath("/a/data");
+        super(
+            /*telemetryEnabled*/ false,
+            options.throttledRequests === undefined ?
+                { ...options.logger!, hasLevel: ts.returnFalse } :
+                options.logger!,
+            options.host,
+            globalTypingsCacheLocation,
+            (...args) => this.session.event(...args),
+            // Some large number so requests arent throttled
+            options.throttledRequests === undefined ? 10 : options.throttledRequests,
+        );
         this.throttleLimit = options.throttleLimit || 5;
         this.installAction = options.installAction !== undefined ? options.installAction : true;
         this.typesRegistry = options.typesRegistry;
+        this.throttledRequests = options.throttledRequests;
     }
 
-    isKnownTypesPackageName(name: string): boolean {
-        // We want to avoid looking this up in the registry as that is expensive. So first check that it's actually an NPM package.
-        const validationResult = ts.JsTyping.validatePackageName(name);
-        if (validationResult !== ts.JsTyping.NameValidationResult.Ok) {
-            return false;
+    protected override createInstallerProcess(): ts.server.TypingsInstallerWorkerProcess {
+        return {
+            send: req => (this.worker ??= new TestTypingsInstallerWorker(this)).handleRequest(req),
+        };
+    }
+
+    override scheduleRequest(request: ts.server.DiscoverTypings): void {
+        if (this.throttledRequests === undefined) {
+            this.activeRequestCount++;
+            this.installer.send(request);
         }
-
-        return this.ensureInstaller().typesRegistry.has(name);
-    }
-
-    installPackage(options: ts.server.InstallPackageOptionsWithProject): Promise<ts.ApplyCodeActionCommandResult> {
-        this.ensureInstaller().installPackage({ kind: "installPackage", ...options });
-        ts.Debug.assert(this.packageInstalledPromise === undefined);
-        return new Promise<ts.ApplyCodeActionCommandResult>((resolve, reject) => {
-            this.packageInstalledPromise = { resolve, reject };
-        });
-    }
-
-    attach(projectService: ts.server.ProjectService) {
-        this.projectService = projectService;
-    }
-
-    onProjectClosed(p: ts.server.Project) {
-        this.installer?.closeProject({ projectName: p.getProjectName(), kind: "closeProject" });
-    }
-
-    enqueueInstallTypingsRequest(project: ts.server.Project, typeAcquisition: ts.TypeAcquisition, unresolvedImports: ts.SortedReadonlyArray<string>) {
-        this.ensureInstaller().enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
-    }
-
-    private ensureInstaller() {
-        return this.installer ??= new TestTypingsInstallerWorker(this);
-    }
-
-    onResponse(response: ts.server.SetTypings | ts.server.InvalidateCachedTypings | ts.server.BeginInstallTypes | ts.server.EndInstallTypes | ts.server.WatchTypingLocations | ts.server.PackageInstalledResponse) {
-        switch (response.kind) {
-            case ActionPackageInstalled: {
-                const { success, message } = response;
-                if (success) {
-                    this.packageInstalledPromise!.resolve({ successMessage: message });
-                }
-                else {
-                    this.packageInstalledPromise!.reject(message);
-                }
-                this.packageInstalledPromise = undefined;
-
-                this.projectService.updateTypingsForProject(response);
-                // The behavior is the same as for setTypings, so send the same event.
-                this.session.event(response, "setTypings");
-                break;
-            }
-            case EventBeginInstallTypes: {
-                const body: ts.server.protocol.BeginInstallTypesEventBody = {
-                    eventId: response.eventId,
-                    packages: response.packagesToInstall,
-                };
-                const eventName: ts.server.protocol.BeginInstallTypesEventName = "beginInstallTypes";
-                this.session.event(body, eventName);
-                break;
-            }
-            case EventEndInstallTypes: {
-                const body: ts.server.protocol.EndInstallTypesEventBody = {
-                    eventId: response.eventId,
-                    packages: response.packagesToInstall,
-                    success: response.installSuccess,
-                };
-                const eventName: ts.server.protocol.EndInstallTypesEventName = "endInstallTypes";
-                this.session.event(body, eventName);
-                break;
-            }
-            case ActionInvalidate: {
-                this.projectService.updateTypingsForProject(response);
-                break;
-            }
-            case ActionSet: {
-                this.projectService.updateTypingsForProject(response);
-                this.session.event(response, "setTypings");
-                break;
-            }
-            case ActionWatchTypingLocations:
-                this.projectService.watchTypingLocations(response);
-                break;
-            default:
-                ts.assertType<never>(response);
+        else {
+            super.scheduleRequest(request);
         }
     }
 }
diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts
index 1aa967443e5..93f31b35915 100644
--- a/src/testRunner/unittests/tsserver/typingsInstaller.ts
+++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts
@@ -537,87 +537,242 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         baselineTsserverLogs("typingsInstaller", "throttle delayed typings to install", session);
     });
 
-    it("Throttle - delayed run install requests", () => {
-        const lodashJs = {
-            path: "/a/b/lodash.js",
-            content: "",
-        };
-        const commanderJs = {
-            path: "/a/b/commander.js",
-            content: "",
-        };
-        const file3 = {
-            path: "/a/b/file3.d.ts",
-            content: "",
-        };
+    describe("throttled testing", () => {
+        function setup() {
+            const lodashJs = {
+                path: "/a/b/lodash.js",
+                content: "",
+            };
+            const commanderJs = {
+                path: "/a/b/commander.js",
+                content: "",
+            };
+            const file3 = {
+                path: "/a/b/file3.d.ts",
+                content: "",
+            };
 
-        const commander: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/commander/index.d.ts",
-            content: "declare const commander: { x: number }",
-            package: "commander",
-        };
-        const jquery: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/jquery/index.d.ts",
-            content: "declare const jquery: { x: number }",
-            package: "jquery",
-        };
-        const lodash: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/lodash/index.d.ts",
-            content: "declare const lodash: { x: number }",
-            package: "lodash",
-        };
-        const cordova: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/cordova/index.d.ts",
-            content: "declare const cordova: { x: number }",
-            package: "cordova",
-        };
-        const grunt: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/grunt/index.d.ts",
-            content: "declare const grunt: { x: number }",
-            package: "grunt",
-        };
-        const gulp: FileWithPackageName = {
-            path: "/a/data/node_modules/@types/gulp/index.d.ts",
-            content: "declare const gulp: { x: number }",
-            package: "gulp",
-        };
+            const commander: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/commander/index.d.ts",
+                content: "declare const commander: { x: number }",
+                package: "commander",
+            };
+            const jquery: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/jquery/index.d.ts",
+                content: "declare const jquery: { x: number }",
+                package: "jquery",
+            };
+            const lodash: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/lodash/index.d.ts",
+                content: "declare const lodash: { x: number }",
+                package: "lodash",
+            };
+            const cordova: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/cordova/index.d.ts",
+                content: "declare const cordova: { x: number }",
+                package: "cordova",
+            };
+            const grunt: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/grunt/index.d.ts",
+                content: "declare const grunt: { x: number }",
+                package: "grunt",
+            };
+            const gulp: FileWithPackageName = {
+                path: "/a/data/node_modules/@types/gulp/index.d.ts",
+                content: "declare const gulp: { x: number }",
+                package: "gulp",
+            };
 
-        const host = createServerHost([lodashJs, commanderJs, file3, customTypesMap]);
-        // Create project #1 with 4 typings
-        const session = new TestSession({
-            host,
-            installAction: [commander, jquery, lodash, cordova, grunt, gulp],
-            throttleLimit: 1,
-            typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            const host = createServerHost([lodashJs, commanderJs, file3, customTypesMap]);
+            return { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host };
+        }
+        it("Throttle - delayed run install requests", () => {
+            const { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host } = setup();
+
+            // Create project #1 with 4 typings
+            const session = new TestSession({
+                host,
+                installAction: [commander, jquery, lodash, cordova, grunt, gulp],
+                throttleLimit: 1,
+                typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            });
+            const projectFileName1 = "/a/app/test1.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName1,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["jquery", "cordova"] },
+            }, session);
+
+            // Create project #2 with 2 typings
+            const projectFileName2 = "/a/app/test2.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
+
+            host.runPendingInstalls();
+            host.runPendingInstalls();
+            host.runQueuedTimeoutCallbacks(); // for 2 projects
+            baselineTsserverLogs("typingsInstaller", "throttle delayed run install requests", session);
         });
-        const projectFileName1 = "/a/app/test1.csproj";
-        openExternalProjectForSession({
-            projectFileName: projectFileName1,
-            options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
-            rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
-            typeAcquisition: { include: ["jquery", "cordova"] },
-        }, session);
 
-        assert.equal(session.typingsInstaller.installer.pendingRunRequests.length, 0, "expect no throttled requests");
+        it("Throttle - scheduled run install requests without reaching limit", () => {
+            const { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host } = setup();
 
-        // Create project #2 with 2 typings
-        const projectFileName2 = "/a/app/test2.csproj";
-        openExternalProjectForSession({
-            projectFileName: projectFileName2,
-            options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
-            rootFiles: [toExternalFile(file3.path)],
-            typeAcquisition: { include: ["grunt", "gulp"] },
-        }, session);
-        assert.equal(session.typingsInstaller.installer.pendingRunRequests.length, 1, "expect one throttled request");
+            const session = new TestSession({
+                host,
+                installAction: [commander, jquery, lodash, cordova, grunt, gulp],
+                throttledRequests: 1,
+                typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            });
+            const projectFileName1 = "/a/app/test1.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName1,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["jquery", "cordova"] },
+            }, session);
 
-        host.runPendingInstalls();
+            host.runQueuedTimeoutCallbacks(); // Send the request to worker for project1
+            host.runPendingInstalls(); // Actual install for project1
 
-        // expected one install request from the second project
-        assert.equal(session.typingsInstaller.installer.pendingRunRequests.length, 0, "expected no throttled requests");
+            const id = host.getNextTimeoutId();
+            const projectFileName2 = "/a/app/test2.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
 
-        host.runPendingInstalls();
-        host.runQueuedTimeoutCallbacks(); // for 2 projects
-        baselineTsserverLogs("typingsInstaller", "throttle delayed run install requests", session);
+            host.runQueuedTimeoutCallbacks(id); // Send the request to worker for project2
+            host.runPendingInstalls(); // Actual install for project2
+            baselineTsserverLogs("typingsInstaller", "throttle scheduled run install requests without reaching limit", session);
+        });
+
+        it("Throttle - scheduled run install requests with defer", () => {
+            const { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host } = setup();
+
+            const session = new TestSession({
+                host,
+                installAction: [commander, jquery, lodash, cordova, grunt, gulp],
+                throttledRequests: 1,
+                typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            });
+            const projectFileName1 = "/a/app/test1.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName1,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["jquery", "cordova"] },
+            }, session);
+
+            // this will be deferred
+            const projectFileName2 = "/a/app/test2.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
+            const id = host.getNextTimeoutId();
+            host.runQueuedTimeoutCallbacks(); // Send the request to worker for project1
+            host.runPendingInstalls(); // Actual install for project1
+
+            host.runQueuedTimeoutCallbacks(id); // Send the request to worker for project2
+            host.runPendingInstalls(); // Actual install for project2
+            baselineTsserverLogs("typingsInstaller", "throttle scheduled run install requests with defer", session);
+        });
+
+        it("Throttle - scheduled run install requests with defer refreshed", () => {
+            const { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host } = setup();
+
+            const session = new TestSession({
+                host,
+                installAction: [commander, jquery, lodash, cordova, grunt, gulp],
+                throttledRequests: 1,
+                typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            });
+            const projectFileName1 = "/a/app/test1.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName1,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(commanderJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["jquery", "cordova"] },
+            }, session);
+
+            // Create project #2 with 2 typings - this will be deferred
+            const projectFileName2 = "/a/app/test2.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
+            // Update project for 3 typings and this should be used instead of first one
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(lodashJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
+            const id = host.getNextTimeoutId();
+            host.runQueuedTimeoutCallbacks(); // Send the request to worker for project1
+            host.runPendingInstalls(); // Actual install for project1
+
+            host.runQueuedTimeoutCallbacks(id); // Send the request to worker for project2
+            host.runPendingInstalls(); // Actual install for project2
+            baselineTsserverLogs("typingsInstaller", "throttle scheduled run install requests with defer refreshed", session);
+        });
+
+        it("Throttle - scheduled run install requests with defer while queuing again", () => {
+            const { lodashJs, commanderJs, file3, commander, jquery, lodash, cordova, grunt, gulp, host } = setup();
+
+            const session = new TestSession({
+                host,
+                installAction: [commander, jquery, lodash, cordova, grunt, gulp],
+                throttledRequests: 1,
+                typesRegistry: ["commander", "jquery", "lodash", "cordova", "gulp", "grunt"],
+            });
+            const projectFileName1 = "/a/app/test1.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName1,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(commanderJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["jquery"] },
+            }, session);
+
+            const projectFileName2 = "/a/app/test2.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName2,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(file3.path)],
+                typeAcquisition: { include: ["grunt", "gulp"] },
+            }, session);
+
+            const projectFileName3 = "/a/app/test3.csproj";
+            openExternalProjectForSession({
+                projectFileName: projectFileName3,
+                options: { allowJS: true, moduleResolution: ts.ModuleResolutionKind.Node10 },
+                rootFiles: [toExternalFile(lodashJs.path), toExternalFile(file3.path)],
+                typeAcquisition: { include: ["cordova"] },
+            }, session);
+            const id = host.getNextTimeoutId();
+            host.runQueuedTimeoutCallbacks(); // Send the request to worker for project1
+            host.runPendingInstalls(); // Actual install for project1
+
+            const id2 = host.getNextTimeoutId();
+            host.runQueuedTimeoutCallbacks(id); // Send the request to worker for project2
+            host.runPendingInstalls(); // Actual install for project2
+
+            host.runQueuedTimeoutCallbacks(id2); // Send the request to worker for project3
+            host.runPendingInstalls(); // Actual install for project3
+
+            baselineTsserverLogs("typingsInstaller", "throttle scheduled run install requests with defer while queuing again", session);
+        });
     });
 
     it("configured scoped name projects discover from node_modules", () => {
diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts
index 0ed4bac6b22..fe4db45d945 100644
--- a/src/tsserver/nodeServer.ts
+++ b/src/tsserver/nodeServer.ts
@@ -1,8 +1,6 @@
 import * as protocol from "../server/protocol";
 import * as ts from "./_namespaces/ts";
 import {
-    ApplyCodeActionCommandResult,
-    assertType,
     CharacterCodes,
     combinePaths,
     createQueue,
@@ -12,7 +10,6 @@ import {
     FileWatcher,
     getDirectoryPath,
     getRootLength,
-    JsTyping,
     LanguageServiceMode,
     MapLike,
     noop,
@@ -20,60 +17,36 @@ import {
     normalizePath,
     normalizeSlashes,
     perfLogger,
-    SortedReadonlyArray,
     startTracing,
     stripQuotes,
     sys,
     toFileNameLowerCase,
     tracing,
-    TypeAcquisition,
     validateLocaleAndSetLanguage,
     versionMajorMinor,
     WatchOptions,
 } from "./_namespaces/ts";
-import * as server from "./_namespaces/ts.server";
 import {
-    ActionInvalidate,
-    ActionPackageInstalled,
-    ActionSet,
-    ActionWatchTypingLocations,
     Arguments,
-    BeginInstallTypes,
-    createInstallTypingsRequest,
-    EndInstallTypes,
-    EventBeginInstallTypes,
-    EventEndInstallTypes,
-    EventInitializationFailed,
-    EventTypesRegistry,
+    Event,
     findArgument,
     formatMessage,
     getLogLevel,
     hasArgument,
     indent,
-    InitializationFailedResponse,
-    InstallPackageOptionsWithProject,
-    InstallPackageRequest,
-    InvalidateCachedTypings,
-    ITypingsInstaller,
     Logger,
     LogLevel,
     Msg,
     nowString,
     nullCancellationToken,
-    nullTypingsInstaller,
-    PackageInstalledResponse,
-    Project,
-    ProjectService,
     ServerCancellationToken,
     ServerHost,
     Session,
-    SetTypings,
     StartInput,
     StartSessionOptions,
     stringifyIndented,
     toEvent,
-    TypesRegistryResponse,
-    TypingInstallerRequestUnion,
+    TypingsInstallerAdapter,
 } from "./_namespaces/ts.server";
 
 interface LogOptions {
@@ -520,69 +493,37 @@ function startNodeSession(options: StartSessionOptions, logger: Logger, cancella
         terminal: false,
     });
 
-    interface QueuedOperation {
-        operationId: string;
-        operation: () => void;
-    }
-
-    class NodeTypingsInstaller implements ITypingsInstaller {
-        private installer!: NodeChildProcess;
-        private projectService!: ProjectService;
-        private activeRequestCount = 0;
-        private requestQueue = createQueue<QueuedOperation>();
-        private requestMap = new Map<string, QueuedOperation>(); // Maps operation ID to newest requestQueue entry with that ID
-        /** We will lazily request the types registry on the first call to `isKnownTypesPackageName` and store it in `typesRegistryCache`. */
-        private requestedRegistry = false;
-        private typesRegistryCache: Map<string, MapLike<string>> | undefined;
-
+    class NodeTypingsInstallerAdapter extends TypingsInstallerAdapter {
+        protected override installer!: NodeChildProcess;
         // This number is essentially arbitrary.  Processing more than one typings request
         // at a time makes sense, but having too many in the pipe results in a hang
         // (see https://github.com/nodejs/node/issues/7657).
         // It would be preferable to base our limit on the amount of space left in the
         // buffer, but we have yet to find a way to retrieve that value.
         private static readonly maxActiveRequestCount = 10;
-        private static readonly requestDelayMillis = 100;
-        private packageInstalledPromise: { resolve(value: ApplyCodeActionCommandResult): void; reject(reason: unknown): void; } | undefined;
 
         constructor(
-            private readonly telemetryEnabled: boolean,
-            private readonly logger: Logger,
-            private readonly host: ServerHost,
-            readonly globalTypingsCacheLocation: string,
+            telemetryEnabled: boolean,
+            logger: Logger,
+            host: ServerHost,
+            globalTypingsCacheLocation: string,
             readonly typingSafeListLocation: string,
             readonly typesMapLocation: string,
             private readonly npmLocation: string | undefined,
             private readonly validateDefaultNpmLocation: boolean,
-            private event: server.Event,
+            event: Event,
         ) {
+            super(
+                telemetryEnabled,
+                logger,
+                host,
+                globalTypingsCacheLocation,
+                event,
+                NodeTypingsInstallerAdapter.maxActiveRequestCount,
+            );
         }
 
-        isKnownTypesPackageName(name: string): boolean {
-            // We want to avoid looking this up in the registry as that is expensive. So first check that it's actually an NPM package.
-            const validationResult = JsTyping.validatePackageName(name);
-            if (validationResult !== JsTyping.NameValidationResult.Ok) {
-                return false;
-            }
-
-            if (this.requestedRegistry) {
-                return !!this.typesRegistryCache && this.typesRegistryCache.has(name);
-            }
-
-            this.requestedRegistry = true;
-            this.send({ kind: "typesRegistry" });
-            return false;
-        }
-
-        installPackage(options: InstallPackageOptionsWithProject): Promise<ApplyCodeActionCommandResult> {
-            this.send<InstallPackageRequest>({ kind: "installPackage", ...options });
-            Debug.assert(this.packageInstalledPromise === undefined);
-            return new Promise<ApplyCodeActionCommandResult>((resolve, reject) => {
-                this.packageInstalledPromise = { resolve, reject };
-            });
-        }
-
-        attach(projectService: ProjectService) {
-            this.projectService = projectService;
+        createInstallerProcess() {
             if (this.logger.hasLevel(LogLevel.requestTime)) {
                 this.logger.info("Binding...");
             }
@@ -634,155 +575,7 @@ function startNodeSession(options: StartSessionOptions, logger: Logger, cancella
             process.on("exit", () => {
                 this.installer.kill();
             });
-        }
-
-        onProjectClosed(p: Project): void {
-            this.send({ projectName: p.getProjectName(), kind: "closeProject" });
-        }
-
-        private send<T extends TypingInstallerRequestUnion>(rq: T): void {
-            this.installer.send(rq);
-        }
-
-        enqueueInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void {
-            const request = createInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
-            if (this.logger.hasLevel(LogLevel.verbose)) {
-                if (this.logger.hasLevel(LogLevel.verbose)) {
-                    this.logger.info(`Scheduling throttled operation:${stringifyIndented(request)}`);
-                }
-            }
-
-            const operationId = project.getProjectName();
-            const operation = () => {
-                if (this.logger.hasLevel(LogLevel.verbose)) {
-                    this.logger.info(`Sending request:${stringifyIndented(request)}`);
-                }
-                this.send(request);
-            };
-            const queuedRequest: QueuedOperation = { operationId, operation };
-
-            if (this.activeRequestCount < NodeTypingsInstaller.maxActiveRequestCount) {
-                this.scheduleRequest(queuedRequest);
-            }
-            else {
-                if (this.logger.hasLevel(LogLevel.verbose)) {
-                    this.logger.info(`Deferring request for: ${operationId}`);
-                }
-                this.requestQueue.enqueue(queuedRequest);
-                this.requestMap.set(operationId, queuedRequest);
-            }
-        }
-
-        private handleMessage(response: TypesRegistryResponse | PackageInstalledResponse | SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | InitializationFailedResponse | server.WatchTypingLocations) {
-            if (this.logger.hasLevel(LogLevel.verbose)) {
-                this.logger.info(`Received response:${stringifyIndented(response)}`);
-            }
-
-            switch (response.kind) {
-                case EventTypesRegistry:
-                    this.typesRegistryCache = new Map(Object.entries(response.typesRegistry));
-                    break;
-                case ActionPackageInstalled: {
-                    const { success, message } = response;
-                    if (success) {
-                        this.packageInstalledPromise!.resolve({ successMessage: message });
-                    }
-                    else {
-                        this.packageInstalledPromise!.reject(message);
-                    }
-                    this.packageInstalledPromise = undefined;
-
-                    this.projectService.updateTypingsForProject(response);
-
-                    // The behavior is the same as for setTypings, so send the same event.
-                    this.event(response, "setTypings");
-                    break;
-                }
-                case EventInitializationFailed: {
-                    const body: protocol.TypesInstallerInitializationFailedEventBody = {
-                        message: response.message,
-                    };
-                    const eventName: protocol.TypesInstallerInitializationFailedEventName = "typesInstallerInitializationFailed";
-                    this.event(body, eventName);
-                    break;
-                }
-                case EventBeginInstallTypes: {
-                    const body: protocol.BeginInstallTypesEventBody = {
-                        eventId: response.eventId,
-                        packages: response.packagesToInstall,
-                    };
-                    const eventName: protocol.BeginInstallTypesEventName = "beginInstallTypes";
-                    this.event(body, eventName);
-                    break;
-                }
-                case EventEndInstallTypes: {
-                    if (this.telemetryEnabled) {
-                        const body: protocol.TypingsInstalledTelemetryEventBody = {
-                            telemetryEventName: "typingsInstalled",
-                            payload: {
-                                installedPackages: response.packagesToInstall.join(","),
-                                installSuccess: response.installSuccess,
-                                typingsInstallerVersion: response.typingsInstallerVersion,
-                            },
-                        };
-                        const eventName: protocol.TelemetryEventName = "telemetry";
-                        this.event(body, eventName);
-                    }
-
-                    const body: protocol.EndInstallTypesEventBody = {
-                        eventId: response.eventId,
-                        packages: response.packagesToInstall,
-                        success: response.installSuccess,
-                    };
-                    const eventName: protocol.EndInstallTypesEventName = "endInstallTypes";
-                    this.event(body, eventName);
-                    break;
-                }
-                case ActionInvalidate: {
-                    this.projectService.updateTypingsForProject(response);
-                    break;
-                }
-                case ActionSet: {
-                    if (this.activeRequestCount > 0) {
-                        this.activeRequestCount--;
-                    }
-                    else {
-                        Debug.fail("Received too many responses");
-                    }
-
-                    while (!this.requestQueue.isEmpty()) {
-                        const queuedRequest = this.requestQueue.dequeue();
-                        if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) {
-                            this.requestMap.delete(queuedRequest.operationId);
-                            this.scheduleRequest(queuedRequest);
-                            break;
-                        }
-
-                        if (this.logger.hasLevel(LogLevel.verbose)) {
-                            this.logger.info(`Skipping defunct request for: ${queuedRequest.operationId}`);
-                        }
-                    }
-
-                    this.projectService.updateTypingsForProject(response);
-
-                    this.event(response, "setTypings");
-
-                    break;
-                }
-                case ActionWatchTypingLocations:
-                    this.projectService.watchTypingLocations(response);
-                    break;
-                default:
-                    assertType<never>(response);
-            }
-        }
-
-        private scheduleRequest(request: QueuedOperation) {
-            if (this.logger.hasLevel(LogLevel.verbose)) {
-                this.logger.info(`Scheduling request for: ${request.operationId}`);
-            }
-            this.activeRequestCount++;
-            this.host.setTimeout(request.operation, NodeTypingsInstaller.requestDelayMillis);
+            return this.installer;
         }
     }
 
@@ -802,13 +595,13 @@ function startNodeSession(options: StartSessionOptions, logger: Logger, cancella
 
             const typingsInstaller = disableAutomaticTypingAcquisition
                 ? undefined
-                : new NodeTypingsInstaller(telemetryEnabled, logger, host, getGlobalTypingsCacheLocation(), typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, event);
+                : new NodeTypingsInstallerAdapter(telemetryEnabled, logger, host, getGlobalTypingsCacheLocation(), typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, event);
 
             super({
                 host,
                 cancellationToken,
                 ...options,
-                typingsInstaller: typingsInstaller || nullTypingsInstaller,
+                typingsInstaller,
                 byteLength: Buffer.byteLength,
                 hrtime: process.hrtime,
                 logger,
diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts
index 4a091ff5970..46ca2f41c48 100644
--- a/src/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/typingsInstaller/nodeTypingsInstaller.ts
@@ -4,7 +4,6 @@ import * as path from "path";
 import {
     combinePaths,
     createGetCanonicalFileName,
-    Debug,
     getDirectoryPath,
     MapLike,
     normalizePath,
@@ -15,14 +14,12 @@ import {
 } from "./_namespaces/ts";
 import {
     Arguments,
-    EventTypesRegistry,
     findArgument,
     hasArgument,
     InitializationFailedResponse,
     InstallTypingHost,
     nowString,
     stringifyIndented,
-    TypesRegistryResponse,
     TypingInstallerRequestUnion,
     TypingInstallerResponseUnion,
 } from "./_namespaces/ts.server";
@@ -156,35 +153,13 @@ export class NodeTypingsInstaller extends TypingsInstaller {
         this.typesRegistry = loadTypesRegistryFile(getTypesRegistryFileLocation(globalTypingsCacheLocation), this.installTypingHost, this.log);
     }
 
-    handleRequest(req: TypingInstallerRequestUnion) {
+    override handleRequest(req: TypingInstallerRequestUnion) {
         if (this.delayedInitializationError) {
             // report initializationFailed error
             this.sendResponse(this.delayedInitializationError);
             this.delayedInitializationError = undefined;
         }
-        switch (req.kind) {
-            case "discover":
-                this.install(req);
-                break;
-            case "closeProject":
-                this.closeProject(req);
-                break;
-            case "typesRegistry": {
-                const typesRegistry: { [key: string]: MapLike<string>; } = {};
-                this.typesRegistry.forEach((value, key) => {
-                    typesRegistry[key] = value;
-                });
-                const response: TypesRegistryResponse = { kind: EventTypesRegistry, typesRegistry };
-                this.sendResponse(response);
-                break;
-            }
-            case "installPackage": {
-                this.installPackage(req);
-                break;
-            }
-            default:
-                Debug.assertNever(req);
-        }
+        super.handleRequest(req);
     }
 
     protected sendResponse(response: TypingInstallerResponseUnion) {
diff --git a/src/typingsInstallerCore/typingsInstaller.ts b/src/typingsInstallerCore/typingsInstaller.ts
index e26f7c51373..e0821418813 100644
--- a/src/typingsInstallerCore/typingsInstaller.ts
+++ b/src/typingsInstallerCore/typingsInstaller.ts
@@ -1,5 +1,6 @@
 import {
     combinePaths,
+    Debug,
     forEachAncestorDirectory,
     forEachKey,
     getBaseFileName,
@@ -28,12 +29,15 @@ import {
     EndInstallTypes,
     EventBeginInstallTypes,
     EventEndInstallTypes,
+    EventTypesRegistry,
     InstallPackageRequest,
     InstallTypingHost,
     InvalidateCachedTypings,
     PackageInstalledResponse,
     SetTypings,
     stringifyIndented,
+    TypesRegistryResponse,
+    TypingInstallerRequestUnion,
     WatchTypingLocations,
 } from "./_namespaces/ts.server";
 
@@ -110,7 +114,7 @@ export abstract class TypingsInstaller {
     private readonly projectWatchers = new Map<string, Set<string>>();
     private safeList: JsTyping.SafeList | undefined;
     /** @internal */
-    readonly pendingRunRequests: PendingRequest[] = [];
+    private pendingRunRequests: PendingRequest[] = [];
 
     private installRunCount = 1;
     private inFlightRequestCount = 0;
@@ -132,6 +136,33 @@ export abstract class TypingsInstaller {
         this.processCacheLocation(this.globalCachePath);
     }
 
+    /** @internal */
+    handleRequest(req: TypingInstallerRequestUnion) {
+        switch (req.kind) {
+            case "discover":
+                this.install(req);
+                break;
+            case "closeProject":
+                this.closeProject(req);
+                break;
+            case "typesRegistry": {
+                const typesRegistry: { [key: string]: MapLike<string>; } = {};
+                this.typesRegistry.forEach((value, key) => {
+                    typesRegistry[key] = value;
+                });
+                const response: TypesRegistryResponse = { kind: EventTypesRegistry, typesRegistry };
+                this.sendResponse(response);
+                break;
+            }
+            case "installPackage": {
+                this.installPackage(req);
+                break;
+            }
+            default:
+                Debug.assertNever(req);
+        }
+    }
+
     closeProject(req: CloseProject) {
         this.closeWatchers(req.projectName);
     }
@@ -493,7 +524,7 @@ export abstract class TypingsInstaller {
     protected abstract installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
     protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | WatchTypingLocations): void;
     /** @internal */
-    protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | WatchTypingLocations | PackageInstalledResponse): void;
+    protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | WatchTypingLocations | PackageInstalledResponse | TypesRegistryResponse): void;
     protected readonly latestDistTag = "latest";
 }
 
diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Auto-importable-file-is-in-inferred-project-until-imported.js b/tests/baselines/reference/tsserver/autoImportProvider/Auto-importable-file-is-in-inferred-project-until-imported.js
index 0ee2a29b2a7..589ed4cc737 100644
--- a/tests/baselines/reference/tsserver/autoImportProvider/Auto-importable-file-is-in-inferred-project-until-imported.js
+++ b/tests/baselines/reference/tsserver/autoImportProvider/Auto-importable-file-is-in-inferred-project-until-imported.js
@@ -89,12 +89,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/node_modules/@angular/forms",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/node_modules/@angular/forms/package.json' dependencies: []
diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js b/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js
index bd404ba947e..14a913d6eb7 100644
--- a/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js
+++ b/tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js
@@ -363,12 +363,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/node_modules/@angular/forms",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/node_modules/@angular/forms/package.json' dependencies: []
diff --git a/tests/baselines/reference/tsserver/autoImportProvider/projects-already-inside-node_modules.js b/tests/baselines/reference/tsserver/autoImportProvider/projects-already-inside-node_modules.js
index 7dc53c7b73a..80b87e8f724 100644
--- a/tests/baselines/reference/tsserver/autoImportProvider/projects-already-inside-node_modules.js
+++ b/tests/baselines/reference/tsserver/autoImportProvider/projects-already-inside-node_modules.js
@@ -86,12 +86,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/node_modules/@angular/forms",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/node_modules/@angular/forms/package.json' dependencies: ["@angular/core"]
diff --git a/tests/baselines/reference/tsserver/auxiliaryProject/does-not-remove-scrips-from-InferredProject.js b/tests/baselines/reference/tsserver/auxiliaryProject/does-not-remove-scrips-from-InferredProject.js
index e746a27bf68..677d1199f38 100644
--- a/tests/baselines/reference/tsserver/auxiliaryProject/does-not-remove-scrips-from-InferredProject.js
+++ b/tests/baselines/reference/tsserver/auxiliaryProject/does-not-remove-scrips-from-InferredProject.js
@@ -204,12 +204,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js b/tests/baselines/reference/tsserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js
index 847b89daf3c..e429e7b857d 100644
--- a/tests/baselines/reference/tsserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js
+++ b/tests/baselines/reference/tsserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js
@@ -233,12 +233,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "e:/myproject/src",
-      "cachePath": "c:/typescript",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path 'c:/typescript', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location 'c:/typescript'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
index 88f7d0cfbf5..469382e7308 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
@@ -127,12 +127,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
index 7fdbd4ad625..205b216477a 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
@@ -128,12 +128,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/configuredProjects/files-are-properly-detached-when-language-service-is-disabled.js b/tests/baselines/reference/tsserver/configuredProjects/files-are-properly-detached-when-language-service-is-disabled.js
index f07110629d3..be4ce0cd195 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/files-are-properly-detached-when-language-service-is-disabled.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/files-are-properly-detached-when-language-service-is-disabled.js
@@ -340,12 +340,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -428,8 +424,6 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/tsconfig.json 2000 undefined Project: /a/tsconfig.json WatchType: Config file
-TI:: [hh:mm:ss:mss] Closing file watchers for project '/a/tsconfig.json'
-TI:: [hh:mm:ss:mss] No watchers are registered for project '/a/tsconfig.json'
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/app.js 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/largefile.js 500 undefined WatchType: Closed Script info
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js b/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
index a87f84df3ec..0eec035cc3d 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-not-close-configured-project-after-closing-last-open-file,-but-should-be-closed-on-next-file-open-if-its-not-the-file-from-same-project.js
@@ -318,12 +318,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -404,8 +400,6 @@ Info seq  [hh:mm:ss:mss] 	Files (1)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-TI:: [hh:mm:ss:mss] Closing file watchers for project '/a/b/tsconfig.json'
-TI:: [hh:mm:ss:mss] No watchers are registered for project '/a/b/tsconfig.json'
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.es6.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/main.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
index 189a2da6059..1ffd94cd90d 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-fails-when-useInferredProjectPerProjectRoot-is-false.js
@@ -108,12 +108,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
index 73aa40f5b5b..8c529f30203 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-projectRootPath-with-useInferredProjectPerProjectRoot.js
@@ -105,12 +105,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -286,12 +282,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
index 5678c5692bd..ab068727bb9 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-with-reference-paths-without-external-project.js
@@ -97,12 +97,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
index e93032e431d..12606aa5c96 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/dynamic-file-without-external-project.js
@@ -112,12 +112,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/opening-and-closing-untitled-files-when-projectRootPath-is-different-from-currentDirectory.js b/tests/baselines/reference/tsserver/dynamicFiles/opening-and-closing-untitled-files-when-projectRootPath-is-different-from-currentDirectory.js
index 61cdac9f500..7c4aaa59d38 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/opening-and-closing-untitled-files-when-projectRootPath-is-different-from-currentDirectory.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/opening-and-closing-untitled-files-when-projectRootPath-is-different-from-currentDirectory.js
@@ -105,12 +105,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js b/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
index 8f37cc91d22..086364ccd63 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
@@ -102,12 +102,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -441,12 +437,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js b/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
index 089077d00cb..b95057f859d 100644
--- a/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
+++ b/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
@@ -385,12 +385,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "exclude": []
       },
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works-with-lazyConfiguredProjectsFromExternalProject.js b/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works-with-lazyConfiguredProjectsFromExternalProject.js
index 50cc31a752a..c70dd744d07 100644
--- a/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works-with-lazyConfiguredProjectsFromExternalProject.js
+++ b/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works-with-lazyConfiguredProjectsFromExternalProject.js
@@ -253,12 +253,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/someuser/project",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works.js b/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works.js
index f1f40a08051..71ebf59d1c4 100644
--- a/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works.js
+++ b/tests/baselines/reference/tsserver/externalProjects/deleting-config-file-opened-from-the-external-project-works.js
@@ -365,12 +365,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/someuser/project",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/externalProjects/handles-creation-of-external-project-with-jsconfig-before-jsconfig-creation-watcher-is-invoked.js b/tests/baselines/reference/tsserver/externalProjects/handles-creation-of-external-project-with-jsconfig-before-jsconfig-creation-watcher-is-invoked.js
index 6b1823cd142..ae8abc0652d 100644
--- a/tests/baselines/reference/tsserver/externalProjects/handles-creation-of-external-project-with-jsconfig-before-jsconfig-creation-watcher-is-invoked.js
+++ b/tests/baselines/reference/tsserver/externalProjects/handles-creation-of-external-project-with-jsconfig-before-jsconfig-creation-watcher-is-invoked.js
@@ -296,12 +296,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -512,12 +508,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/externalProjects/language-service-disabled-state-is-updated-in-external-projects.js b/tests/baselines/reference/tsserver/externalProjects/language-service-disabled-state-is-updated-in-external-projects.js
index a4be013a0d2..64caed13bd3 100644
--- a/tests/baselines/reference/tsserver/externalProjects/language-service-disabled-state-is-updated-in-external-projects.js
+++ b/tests/baselines/reference/tsserver/externalProjects/language-service-disabled-state-is-updated-in-external-projects.js
@@ -196,12 +196,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
index 855734aacb4..eee56c051ea 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-insensitive-system.js
@@ -128,12 +128,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -275,12 +271,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -404,12 +396,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -560,12 +548,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -963,12 +947,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1172,12 +1152,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1301,12 +1277,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1457,12 +1429,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1888,12 +1856,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2099,12 +2063,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2228,12 +2188,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2384,12 +2340,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2787,12 +2739,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2996,12 +2944,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -3125,12 +3069,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -3281,12 +3221,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
index d17f097f7c8..395f643f7af 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root-with-case-sensitive-system.js
@@ -128,12 +128,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -275,12 +271,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -404,12 +396,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -560,12 +548,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -963,12 +947,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1169,12 +1149,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/A",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1324,12 +1300,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1488,12 +1460,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -1949,12 +1917,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2185,12 +2149,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2314,12 +2274,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2470,12 +2426,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -2873,12 +2825,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -3079,12 +3027,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/A",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -3234,12 +3178,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -3400,12 +3340,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
index 599f3d09a78..f64ecea5d54 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/inferred-projects-per-project-root.js
@@ -128,12 +128,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -275,12 +271,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -404,12 +396,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -560,12 +548,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/regression-test---should-infer-typeAcquisition-for-inferred-projects-when-set-undefined.js b/tests/baselines/reference/tsserver/inferredProjects/regression-test---should-infer-typeAcquisition-for-inferred-projects-when-set-undefined.js
index cf1c975b8da..5b34a4147b5 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/regression-test---should-infer-typeAcquisition-for-inferred-projects-when-set-undefined.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/regression-test---should-infer-typeAcquisition-for-inferred-projects-when-set-undefined.js
@@ -74,12 +74,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js b/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js
index 360c305eeae..ce6b6796b59 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/should-still-retain-configured-project-created-while-opening-the-file.js
@@ -223,12 +223,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -458,12 +454,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -636,12 +628,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -764,8 +752,6 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-TI:: [hh:mm:ss:mss] Closing file watchers for project '/user/username/projects/myproject/tsconfig.json'
-TI:: [hh:mm:ss:mss] No watchers are registered for project '/user/username/projects/myproject/tsconfig.json'
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
diff --git a/tests/baselines/reference/tsserver/inferredProjects/should-support-files-without-extensions.js b/tests/baselines/reference/tsserver/inferredProjects/should-support-files-without-extensions.js
index ba15f56ee5a..6e705360829 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/should-support-files-without-extensions.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/should-support-files-without-extensions.js
@@ -94,12 +94,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js b/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js
index 91059398652..d8eb557ef1e 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js
@@ -317,12 +317,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /user/username/projects/myproject/node_modules; all files: ["/user/username/projects/myproject/node_modules/module3/package.json"]
diff --git a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
index 925fee505f0..dd9a02646dc 100644
--- a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
+++ b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
@@ -145,12 +145,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "path"
       ],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /user/username/projects/project1/src/node_modules; all files: []
diff --git a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-be-set-to-2-if-the-project-has-js-root-files.js b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-be-set-to-2-if-the-project-has-js-root-files.js
index 1b9f5e19cb2..b8aaa59d49f 100644
--- a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-be-set-to-2-if-the-project-has-js-root-files.js
+++ b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/should-be-set-to-2-if-the-project-has-js-root-files.js
@@ -88,12 +88,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "test"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
diff --git a/tests/baselines/reference/tsserver/navTo/should-not-include-type-symbols.js b/tests/baselines/reference/tsserver/navTo/should-not-include-type-symbols.js
index 4ceee3e3b34..015ea1b41e5 100644
--- a/tests/baselines/reference/tsserver/navTo/should-not-include-type-symbols.js
+++ b/tests/baselines/reference/tsserver/navTo/should-not-include-type-symbols.js
@@ -128,12 +128,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/navTo/should-work-with-Deprecated.js b/tests/baselines/reference/tsserver/navTo/should-work-with-Deprecated.js
index ee4adfc8c93..6584f3140ea 100644
--- a/tests/baselines/reference/tsserver/navTo/should-work-with-Deprecated.js
+++ b/tests/baselines/reference/tsserver/navTo/should-work-with-Deprecated.js
@@ -129,12 +129,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js b/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js
index af28bbcb7ae..599b208132a 100644
--- a/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js
+++ b/tests/baselines/reference/tsserver/packageJsonInfo/detects-new-package.json-files-that-are-added,-caches-them,-and-watches-them.js
@@ -216,12 +216,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js b/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js
index 43cf8f3a042..f336761ae8b 100644
--- a/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js
+++ b/tests/baselines/reference/tsserver/packageJsonInfo/finds-multiple-package.json-files-when-present.js
@@ -232,12 +232,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["redux","webpack","typescript","react"]
diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js b/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js
index ec9878d98b7..9e6de872a4d 100644
--- a/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js
+++ b/tests/baselines/reference/tsserver/packageJsonInfo/finds-package.json-on-demand,-watches-for-deletion,-and-removes-them-from-cache.js
@@ -232,12 +232,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["redux","webpack","typescript","react"]
@@ -380,12 +376,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js b/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js
index b326fcf825e..75be18de27c 100644
--- a/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js
+++ b/tests/baselines/reference/tsserver/packageJsonInfo/handles-empty-package.json.js
@@ -219,12 +219,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: []
@@ -357,12 +353,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["redux","webpack","typescript","react"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js b/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js
index a61e3f0d3b1..dfd47c02ed9 100644
--- a/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js
+++ b/tests/baselines/reference/tsserver/packageJsonInfo/handles-errors-in-json-parsing-of-package.json.js
@@ -219,12 +219,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: []
@@ -357,12 +353,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["redux","webpack","typescript","react"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projectErrors/for-external-project.js b/tests/baselines/reference/tsserver/projectErrors/for-external-project.js
index 8280f41508d..879ca6e444e 100644
--- a/tests/baselines/reference/tsserver/projectErrors/for-external-project.js
+++ b/tests/baselines/reference/tsserver/projectErrors/for-external-project.js
@@ -94,12 +94,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projectErrors/for-inferred-project.js b/tests/baselines/reference/tsserver/projectErrors/for-inferred-project.js
index 6532bbe2202..35089bb8d09 100644
--- a/tests/baselines/reference/tsserver/projectErrors/for-inferred-project.js
+++ b/tests/baselines/reference/tsserver/projectErrors/for-inferred-project.js
@@ -91,12 +91,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js b/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
index 39982be2735..3a8823375fb 100644
--- a/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
+++ b/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
@@ -126,12 +126,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -317,12 +313,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -726,12 +718,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -846,12 +834,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
index f1e68fe3891..d2caf561547 100644
--- a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
@@ -140,12 +140,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "s"
       ],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["blissfuljs"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["blissfuljs"]
diff --git a/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
index 07727107ae7..753a7000f58 100644
--- a/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
+++ b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
@@ -76,12 +76,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
index 0a436b5a1c3..c83472a3e2a 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-custom-safe-type-list.js
@@ -110,12 +110,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["duck-types"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
index bb3a3500c78..72fd5213266 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-a-legacy-safe-type-list.js
@@ -116,12 +116,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["blissfuljs"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["blissfuljs"]
diff --git a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
index 662a05559b3..2b32ea6a0bc 100644
--- a/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/ignores-files-excluded-by-the-default-type-list.js
@@ -127,12 +127,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["kendo-ui","office"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js b/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js
index 8a95f7183d5..5b58f0d535c 100644
--- a/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js
+++ b/tests/baselines/reference/tsserver/projects/js-file-opened-is-in-configured-project-that-will-be-removed.js
@@ -528,12 +528,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/myproject/apps/editor/scripts",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js b/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js
index 086c658ae99..3bf2cd1e855 100644
--- a/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js
+++ b/tests/baselines/reference/tsserver/projects/loading-files-with-correct-priority.js
@@ -439,12 +439,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -648,12 +644,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -737,8 +729,6 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/tsconfig.json 2000 undefined Project: /a/tsconfig.json WatchType: Config file
-TI:: [hh:mm:ss:mss] Closing file watchers for project '/a/tsconfig.json'
-TI:: [hh:mm:ss:mss] No watchers are registered for project '/a/tsconfig.json'
 Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/tsconfig.json WatchType: Missing file
 Info seq  [hh:mm:ss:mss] `remove Project::
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
diff --git a/tests/baselines/reference/tsserver/projects/regression-test-for-crash-in-acquireOrUpdateDocument.js b/tests/baselines/reference/tsserver/projects/regression-test-for-crash-in-acquireOrUpdateDocument.js
index 9072f91d644..c8a9105f11e 100644
--- a/tests/baselines/reference/tsserver/projects/regression-test-for-crash-in-acquireOrUpdateDocument.js
+++ b/tests/baselines/reference/tsserver/projects/regression-test-for-crash-in-acquireOrUpdateDocument.js
@@ -235,12 +235,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js b/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
index 44167a89b9c..5303d817193 100644
--- a/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
+++ b/tests/baselines/reference/tsserver/projects/should-disable-features-when-the-files-are-too-large.js
@@ -97,12 +97,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -291,12 +287,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js b/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
index b94989a5eff..ace932a16e8 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
@@ -118,12 +118,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js b/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
index 84365ec2ab9..72a80533712 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
@@ -77,12 +77,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "b"
       ],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["b"]
diff --git a/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js b/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
index 7b762bb396e..d980a0909c0 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
@@ -75,12 +75,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
index a91ffc98ce3..eeb69401180 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project-with-skipLibCheck-as-false.js
@@ -101,12 +101,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
index 4326673a823..4eecfef229a 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-external-project.js
@@ -98,12 +98,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-inferred-project.js b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-inferred-project.js
index dc332da4b11..4a9be0b8b97 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/jsonly-inferred-project.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/jsonly-inferred-project.js
@@ -94,12 +94,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -297,12 +293,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -503,12 +495,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-js-project-with-tscheck.js b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-js-project-with-tscheck.js
index 0570c922cdc..c6788c6708c 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-js-project-with-tscheck.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-js-project-with-tscheck.js
@@ -159,12 +159,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-project-with-tscheck.js b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-project-with-tscheck.js
index c7046494921..da24094b7a1 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-project-with-tscheck.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-in-configured-project-with-tscheck.js
@@ -154,12 +154,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-with-tscheck.js b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-with-tscheck.js
index 4f9b8c63f84..315dc5ae0c6 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-with-tscheck.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/reports-semantic-error-with-tscheck.js
@@ -77,12 +77,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js b/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js
index 1215d56b633..50942476f36 100644
--- a/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js
+++ b/tests/baselines/reference/tsserver/skipLibCheck/should-not-report-bind-errors-for-declaration-files-with-skipLibCheck=true.js
@@ -179,12 +179,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/smartSelection/works-for-simple-JavaScript.js b/tests/baselines/reference/tsserver/smartSelection/works-for-simple-JavaScript.js
index 88af3fe47bb..eba632b154f 100644
--- a/tests/baselines/reference/tsserver/smartSelection/works-for-simple-JavaScript.js
+++ b/tests/baselines/reference/tsserver/smartSelection/works-for-simple-JavaScript.js
@@ -99,12 +99,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/telemetry/does-nothing-for-inferred-project.js b/tests/baselines/reference/tsserver/telemetry/does-nothing-for-inferred-project.js
index b86f21bb5ee..a0d7b660a05 100644
--- a/tests/baselines/reference/tsserver/telemetry/does-nothing-for-inferred-project.js
+++ b/tests/baselines/reference/tsserver/telemetry/does-nothing-for-inferred-project.js
@@ -74,12 +74,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js b/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js
index d58ef744780..59c7b913c5f 100644
--- a/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js
+++ b/tests/baselines/reference/tsserver/telemetry/even-for-project-with-ts-check-in-config.js
@@ -161,12 +161,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/telemetry/sends-event-for-inferred-project.js b/tests/baselines/reference/tsserver/telemetry/sends-event-for-inferred-project.js
index 7264d4e2659..98a6cbd3912 100644
--- a/tests/baselines/reference/tsserver/telemetry/sends-event-for-inferred-project.js
+++ b/tests/baselines/reference/tsserver/telemetry/sends-event-for-inferred-project.js
@@ -78,12 +78,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -222,12 +218,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js
index 1ebe128c48b..5f45c97a943 100644
--- a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js
+++ b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-file-sizes.js
@@ -176,12 +176,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js
index 6eafd11c38e..746126dcde5 100644
--- a/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js
+++ b/tests/baselines/reference/tsserver/telemetry/sends-telemetry-for-typeAcquisition-settings.js
@@ -168,12 +168,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["hunter2","hunter3"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/textStorage/should-be-able-to-return-the-file-size-when-a-JS-file-is-too-large-to-load-into-text.js b/tests/baselines/reference/tsserver/textStorage/should-be-able-to-return-the-file-size-when-a-JS-file-is-too-large-to-load-into-text.js
index 229e9d2ebd4..e7f8808270d 100644
--- a/tests/baselines/reference/tsserver/textStorage/should-be-able-to-return-the-file-size-when-a-JS-file-is-too-large-to-load-into-text.js
+++ b/tests/baselines/reference/tsserver/textStorage/should-be-able-to-return-the-file-size-when-a-JS-file-is-too-large-to-load-into-text.js
@@ -86,12 +86,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typeAquisition/does-not-depend-on-extension.js b/tests/baselines/reference/tsserver/typeAquisition/does-not-depend-on-extension.js
index 2965b3ba28b..8410961cb48 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/does-not-depend-on-extension.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/does-not-depend-on-extension.js
@@ -91,12 +91,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typeAquisition/prefer-typings-in-second-pass.js b/tests/baselines/reference/tsserver/typeAquisition/prefer-typings-in-second-pass.js
index 5d8fb17f5fd..f985999c114 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/prefer-typings-in-second-pass.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/prefer-typings-in-second-pass.js
@@ -129,12 +129,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/typings",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/typings', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/typings'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js b/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
index d83c4554960..3ae4d1f26a7 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
@@ -75,12 +75,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "fs"
       ],
       "projectRootPath": "/a",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["commander","node"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
index d6829aa6b76..67dd990f2ed 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
@@ -171,12 +171,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /bower_components; all files: ["/bower_components/jquery/bower.json"]
@@ -538,12 +534,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /bower_components; all files: ["/bower_components/jquery/bower.json"]
 TI:: [hh:mm:ss:mss]     Found package names: ["jquery"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
index b145076c3a3..bc25dec17fa 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
@@ -159,12 +159,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
@@ -494,12 +490,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
index fff2016eb5e..397ad91ee30 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
@@ -170,12 +170,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/bower.json' dependencies: ["jquery"]
@@ -541,12 +537,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/bower.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
index d9dacc24787..365982d86b0 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
@@ -230,12 +230,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "jquery"
       ],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["jquery"]
@@ -591,12 +587,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
index d497573fdf1..c4bc4ccf8fe 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
@@ -219,12 +219,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
index 247b3ae4c83..4d61639f829 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
@@ -225,12 +225,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
index b58fdf58547..2e0f406f4ed 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
@@ -213,12 +213,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["jquery"]
@@ -609,12 +605,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Searching for typing names in /node_modules; all files: ["/node_modules/jquery/package.json"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
index 7acd173c5f9..3862e8906e9 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
@@ -130,12 +130,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
@@ -361,12 +357,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-autoDiscovery.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-autoDiscovery.js
index 1ec2704e2e4..516d66956ae 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-autoDiscovery.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-autoDiscovery.js
@@ -99,12 +99,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-duplicate-package.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-duplicate-package.js
index a74e075bbc1..87efb3e3f24 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-duplicate-package.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-duplicate-package.js
@@ -109,12 +109,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
index f3746969c1b..14504766afe 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
@@ -152,12 +152,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["lodash"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash"]
@@ -440,12 +436,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["lodash"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash"]
 TI:: [hh:mm:ss:mss] Inferred 'react' typings due to presence of '.jsx' extension
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition-with-disableFilenameBasedTypeAcquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition-with-disableFilenameBasedTypeAcquisition.js
index 7f1aa11b5c8..6ee4e61a94c 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition-with-disableFilenameBasedTypeAcquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition-with-disableFilenameBasedTypeAcquisition.js
@@ -101,12 +101,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
index cc8e2254f8c..4530faece00 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
@@ -191,12 +191,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","moment","lodash","commander"]
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["express"]
@@ -527,12 +523,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","moment","lodash","commander"]
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["express"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
index d354bafb58d..fa91d05fb7f 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
@@ -107,12 +107,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
index 04cb6429e19..665b67f9bef 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
@@ -94,12 +94,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
@@ -337,12 +333,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js b/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
index e82b5301451..e93c9da6ad4 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
@@ -104,12 +104,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "fs"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["@ember/component","commander","node"]
@@ -354,12 +350,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
index 2dc157055bb..3f7ad76dbb0 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
@@ -104,12 +104,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "foo"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
@@ -355,12 +351,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
@@ -478,12 +470,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
@@ -624,12 +612,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "bar"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
index fe577e0c2dc..432e690b789 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
@@ -100,12 +100,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "foo"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
@@ -334,12 +330,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
@@ -451,12 +443,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
@@ -595,12 +583,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "bar"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Searching for typing names in /a/b/node_modules; all files: []
 TI:: [hh:mm:ss:mss]     Found package names: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js b/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
index 61fa1ab050f..2b03783a72d 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
@@ -147,12 +147,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js b/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
index 03c532fc9f4..1b6186f4633 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
@@ -89,12 +89,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["co } }"]
@@ -222,12 +218,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -416,12 +408,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js
index ddbfa3f6ca0..d4102489ed9 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/multiple-projects.js
@@ -189,12 +189,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/project",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/user/username/projects/project/package.json' dependencies: ["jquery"]
@@ -488,12 +484,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/project",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/user/username/projects/project/package.json' dependencies: ["jquery"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -709,12 +701,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/project2",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/user/username/projects/project2/package.json' dependencies: ["commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
index 650a360a2c8..7af660254bf 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/non-expired-cache-entry.js
@@ -130,12 +130,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["jquery"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/pick-typing-names-from-nonrelative-unresolved-imports.js b/tests/baselines/reference/tsserver/typingsInstaller/pick-typing-names-from-nonrelative-unresolved-imports.js
index dfdb2ce4d61..22ada980880 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/pick-typing-names-from-nonrelative-unresolved-imports.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/pick-typing-names-from-nonrelative-unresolved-imports.js
@@ -102,12 +102,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "foo"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["@bar/common","@bar/router","foo"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification-for-error.js b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification-for-error.js
index 213323ff6a6..df29f8bd47e 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification-for-error.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification-for-error.js
@@ -93,12 +93,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/package.json' dependencies: ["commander"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
index bdbb58390a5..e637585adf0 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
@@ -102,12 +102,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/package.json' dependencies: ["commander"]
@@ -327,12 +323,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/package.json' dependencies: ["commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/projectRootPath-is-provided-for-inferred-project.js b/tests/baselines/reference/tsserver/typingsInstaller/projectRootPath-is-provided-for-inferred-project.js
index b52fd53767e..7c7cab605af 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/projectRootPath-is-provided-for-inferred-project.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/projectRootPath-is-provided-for-inferred-project.js
@@ -161,12 +161,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/san2",
-      "cachePath": "/users/username/Library/Caches/typescript/2.7",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/users/username/Library/Caches/typescript/2.7', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/users/username/Library/Caches/typescript/2.7'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
index def79fb2df6..2fedeca8520 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
@@ -135,12 +135,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "commander"
       ],
       "projectRootPath": "/user/username/projects/a/b",
-      "cachePath": "/user/username/projects/a/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/user/username/projects/a/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/user/username/projects/a/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["commander"]
@@ -378,12 +374,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/user/username/projects/a/b",
-      "cachePath": "/user/username/projects/a/cache",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/user/username/projects/a/cache', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/user/username/projects/a/cache'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
index d5b65556faf..89f0157b563 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
@@ -208,12 +208,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["@zkat/cacache"]
@@ -604,12 +600,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/package.json' dependencies: ["@zkat/cacache"]
 TI:: [hh:mm:ss:mss] Searching for typing names in /node_modules; all files: ["/node_modules/@zkat/cacache/package.json"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js b/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
index 9fd2e2b8eac..c4b2af88c95 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
@@ -109,12 +109,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "stream"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["node"]
@@ -345,12 +341,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -499,12 +491,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "s tream"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["s tream"]
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -671,12 +659,8 @@ TI:: [hh:mm:ss:mss] Got install request
         "s tream"
       ],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["bar","s tream"]
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/should-not-initialize-invaalid-package-names.js b/tests/baselines/reference/tsserver/typingsInstaller/should-not-initialize-invaalid-package-names.js
index 15ea474f087..1f87f45bbe7 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/should-not-initialize-invaalid-package-names.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/should-not-initialize-invaalid-package-names.js
@@ -81,12 +81,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/b",
-      "cachePath": "/tmp",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/tmp', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/tmp'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["; say ‘Hello from TypeScript!’ #"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js b/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
index b77886544cc..7be357a81da 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
@@ -93,12 +93,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/package.json' dependencies: ["commander"]
@@ -318,12 +314,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a",
-      "cachePath": "/a/cache/",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/cache/', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/cache/'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Typing names in '/a/package.json' dependencies: ["commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
index 7d53836ec18..e8e502bd6ef 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
@@ -199,12 +199,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","cordova","lodash","commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
@@ -399,12 +395,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
@@ -796,12 +788,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","cordova","lodash","commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -930,12 +918,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp"]
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
 TI:: [hh:mm:ss:mss] Finished typings discovery:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
index c555a5d5fa6..68705b86c40 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
@@ -196,12 +196,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","moment","lodash","commander"]
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["express"]
@@ -541,12 +537,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "/a/app",
-      "cachePath": "/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","moment","lodash","commander"]
 TI:: [hh:mm:ss:mss] Typing names in '/a/b/package.json' dependencies: ["express"]
 TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-refreshed.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-refreshed.js
new file mode 100644
index 00000000000..eaed111ce85
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-refreshed.js
@@ -0,0 +1,1039 @@
+currentDirectory:: / useCaseSensitiveFileNames: false
+Before request
+//// [/a/b/lodash.js]
+
+
+//// [/a/b/commander.js]
+
+
+//// [/a/b/file3.d.ts]
+
+
+//// [/typesMap.json]
+{
+            "typesMap": {
+                "jquery": {
+                    "match": "jquery(-(\\.?\\d+)+)?(\\.intellisense)?(\\.min)?\\.js$",
+                    "types": ["jquery"]
+                },
+                "quack": {
+                    "match": "/duckquack-(\\d+)\\.min\\.js",
+                    "types": ["duck-types"]
+                }
+            },
+            "simpleMap": {
+                "Bacon": "baconjs",
+                "bliss": "blissfuljs",
+                "commander": "commander",
+                "cordova": "cordova",
+                "react": "react",
+                "lodash": "lodash"
+            }
+        }
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test1.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/commander.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova"
+          ]
+        }
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/commander.js' because it matched commander from the legacy safelist
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/file3.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test1.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test1.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test1.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "d57df0c2e801fc85740246bb38cad99e380b98923a5bdf2b146062324576d721",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+PolledWatches::
+/a/lib/lib.d.ts: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts: *new*
+  {}
+
+Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover *new*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test2.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ]
+        }
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test2.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test2.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test2.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Deferring request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "708ab763923f965e4d2f19cfd2dca6beb9d49c11ba2c52d06b3375b1867b290b",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test2.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/lodash.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ]
+        }
+      },
+      "seq": 3,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/lodash.js' because it matched lodash from the legacy safelist
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test2.csproj Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Same program as before
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Deferring request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Before running Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover
+
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: Creating typing installer
+
+TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json
+TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'...
+TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one...
+TI:: [hh:mm:ss:mss] Updating types-registry npm package...
+TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest
+TI:: [hh:mm:ss:mss] Updated types-registry npm package
+TI:: typing installer creation complete
+//// [/a/data/package.json]
+{ "private": true }
+
+//// [/a/data/node_modules/types-registry/index.json]
+{
+  "entries": {
+    "commander": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "jquery": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "lodash": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "cordova": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "gulp": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "grunt": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    }
+  }
+}
+
+
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
+TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","cordova","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "jquery",
+        "cordova",
+        "commander"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["jquery","cordova","commander"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 1
+      }
+    }
+TI:: [hh:mm:ss:mss] #1 with cwd: /a/data arguments: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 0
+
+PolledWatches::
+/a/app/bower_components: *new*
+  {"pollingInterval":500}
+/a/app/node_modules: *new*
+  {"pollingInterval":500}
+/a/b/bower_components: *new*
+  {"pollingInterval":500}
+/a/b/node_modules: *new*
+  {"pollingInterval":500}
+/a/lib/lib.d.ts:
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts:
+  {}
+
+PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@ts5.4",
+  "@types/cordova@ts5.4",
+  "@types/commander@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+
+TI:: Installation #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/commander/index.d.ts]
+declare const commander: { x: number }
+
+//// [/a/data/node_modules/@types/jquery/index.d.ts]
+declare const jquery: { x: number }
+
+//// [/a/data/node_modules/@types/cordova/index.d.ts]
+declare const cordova: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/jquery@tsFakeMajor.Minor","@types/cordova@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/cordova/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Skipping defunct request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test1.csproj",
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova",
+            "commander"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/jquery/index.d.ts",
+          "/a/data/node_modules/@types/cordova/index.d.ts",
+          "/a/data/node_modules/@types/commander/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 1,
+        "packages": [
+          "@types/jquery@tsFakeMajor.Minor",
+          "@types/cordova@tsFakeMajor.Minor",
+          "@types/commander@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover *new*
+3: /a/app/test1.csproj *new*
+
+Before running Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover
+3: /a/app/test1.csproj
+
+Invoking Timeout callback:: timeoutId:: 2:: /a/app/test2.csproj::discover
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp","lodash"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "grunt",
+        "gulp",
+        "lodash"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["grunt","gulp","lodash"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 2
+      }
+    }
+TI:: [hh:mm:ss:mss] #2 with cwd: /a/data arguments: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 1
+
+PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@ts5.4",
+  "@types/gulp@ts5.4",
+  "@types/lodash@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+]
+
+TI:: Installation #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/lodash/index.d.ts]
+declare const lodash: { x: number }
+
+//// [/a/data/node_modules/@types/grunt/index.d.ts]
+declare const grunt: { x: number }
+
+//// [/a/data/node_modules/@types/gulp/index.d.ts]
+declare const gulp: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/grunt@tsFakeMajor.Minor","@types/gulp@tsFakeMajor.Minor","@types/lodash@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/grunt/index.d.ts","/a/data/node_modules/@types/gulp/index.d.ts","/a/data/node_modules/@types/lodash/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test2.csproj",
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp",
+            "lodash"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/grunt/index.d.ts",
+          "/a/data/node_modules/@types/gulp/index.d.ts",
+          "/a/data/node_modules/@types/lodash/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 2,
+        "packages": [
+          "@types/grunt@tsFakeMajor.Minor",
+          "@types/gulp@tsFakeMajor.Minor",
+          "@types/lodash@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+3: /a/app/test1.csproj
+4: /a/app/test2.csproj *new*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-while-queuing-again.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-while-queuing-again.js
new file mode 100644
index 00000000000..14244c256ca
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer-while-queuing-again.js
@@ -0,0 +1,1316 @@
+currentDirectory:: / useCaseSensitiveFileNames: false
+Before request
+//// [/a/b/lodash.js]
+
+
+//// [/a/b/commander.js]
+
+
+//// [/a/b/file3.d.ts]
+
+
+//// [/typesMap.json]
+{
+            "typesMap": {
+                "jquery": {
+                    "match": "jquery(-(\\.?\\d+)+)?(\\.intellisense)?(\\.min)?\\.js$",
+                    "types": ["jquery"]
+                },
+                "quack": {
+                    "match": "/duckquack-(\\d+)\\.min\\.js",
+                    "types": ["duck-types"]
+                }
+            },
+            "simpleMap": {
+                "Bacon": "baconjs",
+                "bliss": "blissfuljs",
+                "commander": "commander",
+                "cordova": "cordova",
+                "react": "react",
+                "lodash": "lodash"
+            }
+        }
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test1.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/commander.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "jquery"
+          ]
+        }
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/commander.js' because it matched commander from the legacy safelist
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/file3.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test1.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test1.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test1.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "d57df0c2e801fc85740246bb38cad99e380b98923a5bdf2b146062324576d721",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+PolledWatches::
+/a/lib/lib.d.ts: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts: *new*
+  {}
+
+Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover *new*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test2.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ]
+        }
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test2.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test2.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test2.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Deferring request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "708ab763923f965e4d2f19cfd2dca6beb9d49c11ba2c52d06b3375b1867b290b",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test3.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/lodash.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "cordova"
+          ]
+        }
+      },
+      "seq": 3,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/lodash.js' because it matched lodash from the legacy safelist
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test3.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test3.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test3.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test3.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test3.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "cordova",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Deferring request for: /a/app/test3.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "5d322fe3ca31af82cbdcc0d00ec687f0e61a044e99fcdbe8f28f538027445147",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Before running Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover
+
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: Creating typing installer
+
+TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json
+TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'...
+TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one...
+TI:: [hh:mm:ss:mss] Updating types-registry npm package...
+TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest
+TI:: [hh:mm:ss:mss] Updated types-registry npm package
+TI:: typing installer creation complete
+//// [/a/data/package.json]
+{ "private": true }
+
+//// [/a/data/node_modules/types-registry/index.json]
+{
+  "entries": {
+    "commander": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "jquery": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "lodash": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "cordova": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "gulp": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "grunt": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    }
+  }
+}
+
+
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
+TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "jquery",
+        "commander"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["jquery","commander"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 1
+      }
+    }
+TI:: [hh:mm:ss:mss] #1 with cwd: /a/data arguments: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 0
+
+PolledWatches::
+/a/app/bower_components: *new*
+  {"pollingInterval":500}
+/a/app/node_modules: *new*
+  {"pollingInterval":500}
+/a/b/bower_components: *new*
+  {"pollingInterval":500}
+/a/b/node_modules: *new*
+  {"pollingInterval":500}
+/a/lib/lib.d.ts:
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts:
+  {}
+
+PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@ts5.4",
+  "@types/commander@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+
+TI:: Installation #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/commander/index.d.ts]
+declare const commander: { x: number }
+
+//// [/a/data/node_modules/@types/jquery/index.d.ts]
+declare const jquery: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/jquery@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test1.csproj",
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "commander"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/jquery/index.d.ts",
+          "/a/data/node_modules/@types/commander/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 1,
+        "packages": [
+          "@types/jquery@tsFakeMajor.Minor",
+          "@types/commander@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover *new*
+3: /a/app/test1.csproj *new*
+
+Before running Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover
+3: /a/app/test1.csproj
+
+Invoking Timeout callback:: timeoutId:: 2:: /a/app/test2.csproj::discover
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "grunt",
+        "gulp"
+      ],
+      "filesToWatch": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 2
+      }
+    }
+TI:: [hh:mm:ss:mss] #2 with cwd: /a/data arguments: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 1
+
+PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@ts5.4",
+  "@types/gulp@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+
+TI:: Installation #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/grunt/index.d.ts]
+declare const grunt: { x: number }
+
+//// [/a/data/node_modules/@types/gulp/index.d.ts]
+declare const gulp: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/grunt@tsFakeMajor.Minor","@types/gulp@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/grunt/index.d.ts","/a/data/node_modules/@types/gulp/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test3.csproj
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test2.csproj",
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/grunt/index.d.ts",
+          "/a/data/node_modules/@types/gulp/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 2,
+        "packages": [
+          "@types/grunt@tsFakeMajor.Minor",
+          "@types/gulp@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 3
+3: /a/app/test1.csproj
+4: /a/app/test3.csproj::discover *new*
+5: /a/app/test2.csproj *new*
+
+Before running Timeout callback:: count: 3
+3: /a/app/test1.csproj
+4: /a/app/test3.csproj::discover
+5: /a/app/test2.csproj
+
+Invoking Timeout callback:: timeoutId:: 4:: /a/app/test3.csproj::discover
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test3.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "cordova",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test3.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "cordova",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Explicitly included types: ["cordova","lodash"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "cordova",
+        "lodash"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test3.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test3.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test3.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["cordova","lodash"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 3,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test3.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 3,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test3.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 3
+      }
+    }
+TI:: [hh:mm:ss:mss] #3 with cwd: /a/data arguments: [
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 2
+
+PendingInstalls callback:: count: 1
+3: #3 with arguments:: [
+  "@types/cordova@ts5.4",
+  "@types/lodash@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+3: #3 with arguments:: [
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+]
+
+TI:: Installation #3 with arguments:: [
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/lodash/index.d.ts]
+declare const lodash: { x: number }
+
+//// [/a/data/node_modules/@types/cordova/index.d.ts]
+declare const cordova: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/cordova@tsFakeMajor.Minor","@types/lodash@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/cordova/index.d.ts","/a/data/node_modules/@types/lodash/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test3.csproj",
+      "typeAcquisition": {
+        "include": [
+          "cordova",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test3.csproj",
+      "typeAcquisition": {
+        "include": [
+          "cordova",
+          "lodash"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test3.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test3.csproj",
+        "typeAcquisition": {
+          "include": [
+            "cordova",
+            "lodash"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/cordova/index.d.ts",
+          "/a/data/node_modules/@types/lodash/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 3,
+      "projectName": "/a/app/test3.csproj",
+      "packagesToInstall": [
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 3,
+      "projectName": "/a/app/test3.csproj",
+      "packagesToInstall": [
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 3,
+        "packages": [
+          "@types/cordova@tsFakeMajor.Minor",
+          "@types/lodash@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 3
+3: /a/app/test1.csproj
+5: /a/app/test2.csproj
+6: /a/app/test3.csproj *new*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer.js
new file mode 100644
index 00000000000..c33b1c91ffc
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-with-defer.js
@@ -0,0 +1,966 @@
+currentDirectory:: / useCaseSensitiveFileNames: false
+Before request
+//// [/a/b/lodash.js]
+
+
+//// [/a/b/commander.js]
+
+
+//// [/a/b/file3.d.ts]
+
+
+//// [/typesMap.json]
+{
+            "typesMap": {
+                "jquery": {
+                    "match": "jquery(-(\\.?\\d+)+)?(\\.intellisense)?(\\.min)?\\.js$",
+                    "types": ["jquery"]
+                },
+                "quack": {
+                    "match": "/duckquack-(\\d+)\\.min\\.js",
+                    "types": ["duck-types"]
+                }
+            },
+            "simpleMap": {
+                "Bacon": "baconjs",
+                "bliss": "blissfuljs",
+                "commander": "commander",
+                "cordova": "cordova",
+                "react": "react",
+                "lodash": "lodash"
+            }
+        }
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test1.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/lodash.js"
+          },
+          {
+            "fileName": "/a/b/commander.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova"
+          ]
+        }
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/lodash.js' because it matched lodash from the legacy safelist
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/commander.js' because it matched commander from the legacy safelist
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/file3.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test1.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test1.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test1.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "d57df0c2e801fc85740246bb38cad99e380b98923a5bdf2b146062324576d721",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+PolledWatches::
+/a/lib/lib.d.ts: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts: *new*
+  {}
+
+Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover *new*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test2.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ]
+        }
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test2.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test2.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test2.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Deferring request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "708ab763923f965e4d2f19cfd2dca6beb9d49c11ba2c52d06b3375b1867b290b",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Before running Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover
+
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: Creating typing installer
+
+TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json
+TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'...
+TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one...
+TI:: [hh:mm:ss:mss] Updating types-registry npm package...
+TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest
+TI:: [hh:mm:ss:mss] Updated types-registry npm package
+TI:: typing installer creation complete
+//// [/a/data/package.json]
+{ "private": true }
+
+//// [/a/data/node_modules/types-registry/index.json]
+{
+  "entries": {
+    "commander": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "jquery": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "lodash": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "cordova": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "gulp": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "grunt": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    }
+  }
+}
+
+
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
+TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","cordova","lodash","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "jquery",
+        "cordova",
+        "lodash",
+        "commander"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["jquery","cordova","lodash","commander"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 1
+      }
+    }
+TI:: [hh:mm:ss:mss] #1 with cwd: /a/data arguments: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 0
+
+PolledWatches::
+/a/app/bower_components: *new*
+  {"pollingInterval":500}
+/a/app/node_modules: *new*
+  {"pollingInterval":500}
+/a/b/bower_components: *new*
+  {"pollingInterval":500}
+/a/b/node_modules: *new*
+  {"pollingInterval":500}
+/a/lib/lib.d.ts:
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts:
+  {}
+
+PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@ts5.4",
+  "@types/cordova@ts5.4",
+  "@types/lodash@ts5.4",
+  "@types/commander@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+
+TI:: Installation #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/commander/index.d.ts]
+declare const commander: { x: number }
+
+//// [/a/data/node_modules/@types/jquery/index.d.ts]
+declare const jquery: { x: number }
+
+//// [/a/data/node_modules/@types/lodash/index.d.ts]
+declare const lodash: { x: number }
+
+//// [/a/data/node_modules/@types/cordova/index.d.ts]
+declare const cordova: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/jquery@tsFakeMajor.Minor","@types/cordova@tsFakeMajor.Minor","@types/lodash@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/cordova/index.d.ts","/a/data/node_modules/@types/lodash/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test1.csproj",
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova",
+            "lodash",
+            "commander"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/jquery/index.d.ts",
+          "/a/data/node_modules/@types/cordova/index.d.ts",
+          "/a/data/node_modules/@types/lodash/index.d.ts",
+          "/a/data/node_modules/@types/commander/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 1,
+        "packages": [
+          "@types/jquery@tsFakeMajor.Minor",
+          "@types/cordova@tsFakeMajor.Minor",
+          "@types/lodash@tsFakeMajor.Minor",
+          "@types/commander@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover *new*
+3: /a/app/test1.csproj *new*
+
+Before running Timeout callback:: count: 2
+2: /a/app/test2.csproj::discover
+3: /a/app/test1.csproj
+
+Invoking Timeout callback:: timeoutId:: 2:: /a/app/test2.csproj::discover
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "grunt",
+        "gulp"
+      ],
+      "filesToWatch": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 2
+      }
+    }
+TI:: [hh:mm:ss:mss] #2 with cwd: /a/data arguments: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 1
+
+PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@ts5.4",
+  "@types/gulp@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+
+TI:: Installation #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/grunt/index.d.ts]
+declare const grunt: { x: number }
+
+//// [/a/data/node_modules/@types/gulp/index.d.ts]
+declare const gulp: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/grunt@tsFakeMajor.Minor","@types/gulp@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/grunt/index.d.ts","/a/data/node_modules/@types/gulp/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test2.csproj",
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/grunt/index.d.ts",
+          "/a/data/node_modules/@types/gulp/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 2,
+        "packages": [
+          "@types/grunt@tsFakeMajor.Minor",
+          "@types/gulp@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+3: /a/app/test1.csproj
+4: /a/app/test2.csproj *new*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-without-reaching-limit.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-without-reaching-limit.js
new file mode 100644
index 00000000000..c51f0098769
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-scheduled-run-install-requests-without-reaching-limit.js
@@ -0,0 +1,968 @@
+currentDirectory:: / useCaseSensitiveFileNames: false
+Before request
+//// [/a/b/lodash.js]
+
+
+//// [/a/b/commander.js]
+
+
+//// [/a/b/file3.d.ts]
+
+
+//// [/typesMap.json]
+{
+            "typesMap": {
+                "jquery": {
+                    "match": "jquery(-(\\.?\\d+)+)?(\\.intellisense)?(\\.min)?\\.js$",
+                    "types": ["jquery"]
+                },
+                "quack": {
+                    "match": "/duckquack-(\\d+)\\.min\\.js",
+                    "types": ["duck-types"]
+                }
+            },
+            "simpleMap": {
+                "Bacon": "baconjs",
+                "bliss": "blissfuljs",
+                "commander": "commander",
+                "cordova": "cordova",
+                "react": "react",
+                "lodash": "lodash"
+            }
+        }
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test1.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/lodash.js"
+          },
+          {
+            "fileName": "/a/b/commander.js"
+          },
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova"
+          ]
+        }
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/lodash.js' because it matched lodash from the legacy safelist
+Info seq  [hh:mm:ss:mss] Excluded '/a/b/commander.js' because it matched commander from the legacy safelist
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/file3.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test1.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test1.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test1.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "d57df0c2e801fc85740246bb38cad99e380b98923a5bdf2b146062324576d721",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+PolledWatches::
+/a/lib/lib.d.ts: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts: *new*
+  {}
+
+Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover *new*
+
+Before running Timeout callback:: count: 1
+1: /a/app/test1.csproj::discover
+
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: Creating typing installer
+
+TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json
+TI:: [hh:mm:ss:mss] Processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'...
+TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data'
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one...
+TI:: [hh:mm:ss:mss] Updating types-registry npm package...
+TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest
+TI:: [hh:mm:ss:mss] Updated types-registry npm package
+TI:: typing installer creation complete
+//// [/a/data/package.json]
+{ "private": true }
+
+//// [/a/data/node_modules/types-registry/index.json]
+{
+  "entries": {
+    "commander": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "jquery": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "lodash": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "cordova": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "gulp": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    },
+    "grunt": {
+      "latest": "1.3.0",
+      "ts2.0": "1.0.0",
+      "ts2.1": "1.0.0",
+      "ts2.2": "1.2.0",
+      "ts2.3": "1.3.0",
+      "ts2.4": "1.3.0",
+      "ts2.5": "1.3.0",
+      "ts2.6": "1.3.0",
+      "ts2.7": "1.3.0"
+    }
+  }
+}
+
+
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test1.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts",
+        "/a/b/lodash.js",
+        "/a/b/commander.js"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Loaded safelist from types map file '/typesMap.json'
+TI:: [hh:mm:ss:mss] Explicitly included types: ["jquery","cordova","lodash","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from file names: ["lodash","commander"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "jquery",
+        "cordova",
+        "lodash",
+        "commander"
+      ],
+      "filesToWatch": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test1.csproj",
+      "files": [
+        "/a/b/bower_components",
+        "/a/b/node_modules",
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test1.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["jquery","cordova","lodash","commander"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 1,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test1.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 1
+      }
+    }
+TI:: [hh:mm:ss:mss] #1 with cwd: /a/data arguments: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 0
+
+PolledWatches::
+/a/app/bower_components: *new*
+  {"pollingInterval":500}
+/a/app/node_modules: *new*
+  {"pollingInterval":500}
+/a/b/bower_components: *new*
+  {"pollingInterval":500}
+/a/b/node_modules: *new*
+  {"pollingInterval":500}
+/a/lib/lib.d.ts:
+  {"pollingInterval":500}
+
+FsWatches::
+/a/b/file3.d.ts:
+  {}
+
+PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@ts5.4",
+  "@types/cordova@ts5.4",
+  "@types/lodash@ts5.4",
+  "@types/commander@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+1: #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+]
+
+TI:: Installation #1 with arguments:: [
+  "@types/jquery@tsFakeMajor.Minor",
+  "@types/cordova@tsFakeMajor.Minor",
+  "@types/lodash@tsFakeMajor.Minor",
+  "@types/commander@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/commander/index.d.ts]
+declare const commander: { x: number }
+
+//// [/a/data/node_modules/@types/jquery/index.d.ts]
+declare const jquery: { x: number }
+
+//// [/a/data/node_modules/@types/lodash/index.d.ts]
+declare const lodash: { x: number }
+
+//// [/a/data/node_modules/@types/cordova/index.d.ts]
+declare const cordova: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/jquery@tsFakeMajor.Minor","@types/cordova@tsFakeMajor.Minor","@types/lodash@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/cordova/index.d.ts","/a/data/node_modules/@types/lodash/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test1.csproj",
+      "typeAcquisition": {
+        "include": [
+          "jquery",
+          "cordova",
+          "lodash",
+          "commander"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/jquery/index.d.ts",
+        "/a/data/node_modules/@types/cordova/index.d.ts",
+        "/a/data/node_modules/@types/lodash/index.d.ts",
+        "/a/data/node_modules/@types/commander/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test1.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test1.csproj",
+        "typeAcquisition": {
+          "include": [
+            "jquery",
+            "cordova",
+            "lodash",
+            "commander"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/jquery/index.d.ts",
+          "/a/data/node_modules/@types/cordova/index.d.ts",
+          "/a/data/node_modules/@types/lodash/index.d.ts",
+          "/a/data/node_modules/@types/commander/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 1,
+      "projectName": "/a/app/test1.csproj",
+      "packagesToInstall": [
+        "@types/jquery@tsFakeMajor.Minor",
+        "@types/cordova@tsFakeMajor.Minor",
+        "@types/lodash@tsFakeMajor.Minor",
+        "@types/commander@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 1,
+        "packages": [
+          "@types/jquery@tsFakeMajor.Minor",
+          "@types/cordova@tsFakeMajor.Minor",
+          "@types/lodash@tsFakeMajor.Minor",
+          "@types/commander@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 1
+2: /a/app/test1.csproj *new*
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "openExternalProject",
+      "arguments": {
+        "projectFileName": "/a/app/test2.csproj",
+        "options": {
+          "allowJS": true,
+          "moduleResolution": 2
+        },
+        "rootFiles": [
+          {
+            "fileName": "/a/b/file3.d.ts"
+          }
+        ],
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ]
+        }
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/app/test2.csproj WatchType: Missing file
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/app/test2.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/a/app/test2.csproj' (External)
+Info seq  [hh:mm:ss:mss] 	Files (1)
+	/a/b/file3.d.ts Text-1 ""
+
+
+	../b/file3.d.ts
+	  Root file specified for compilation
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling throttled operation:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Scheduling request for: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "telemetry",
+      "body": {
+        "telemetryEventName": "projectInfo",
+        "payload": {
+          "projectId": "708ab763923f965e4d2f19cfd2dca6beb9d49c11ba2c52d06b3375b1867b290b",
+          "fileStats": {
+            "js": 0,
+            "jsSize": 0,
+            "jsx": 0,
+            "jsxSize": 0,
+            "ts": 0,
+            "tsSize": 0,
+            "tsx": 0,
+            "tsxSize": 0,
+            "dts": 1,
+            "dtsSize": 0,
+            "deferred": 0,
+            "deferredSize": 0
+          },
+          "compilerOptions": {
+            "allowJS": true,
+            "moduleResolution": "node10"
+          },
+          "typeAcquisition": {
+            "enable": true,
+            "include": true,
+            "exclude": false
+          },
+          "compileOnSave": true,
+          "configFileName": "other",
+          "projectType": "external",
+          "languageServiceEnabled": true,
+          "version": "FakeVersion"
+        }
+      }
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": true,
+      "responseRequired": true
+    }
+After request
+
+Timeout callback:: count: 2
+2: /a/app/test1.csproj
+3: /a/app/test2.csproj::discover *new*
+
+Before running Timeout callback:: count: 2
+2: /a/app/test1.csproj
+3: /a/app/test2.csproj::discover
+
+Invoking Timeout callback:: timeoutId:: 3:: /a/app/test2.csproj::discover
+Info seq  [hh:mm:ss:mss] TIAdapter:: Sending request:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Got install request
+    {
+      "projectName": "/a/app/test2.csproj",
+      "fileNames": [
+        "/a/b/file3.d.ts"
+      ],
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "unresolvedImports": [],
+      "projectRootPath": "/a/app",
+      "kind": "discover"
+    }
+TI:: [hh:mm:ss:mss] Explicitly included types: ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
+TI:: [hh:mm:ss:mss] Finished typings discovery:
+    {
+      "cachedTypingPaths": [],
+      "newTypingNames": [
+        "grunt",
+        "gulp"
+      ],
+      "filesToWatch": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/a/app/test2.csproj",
+      "files": [
+        "/a/app/bower_components",
+        "/a/app/node_modules"
+      ]
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/bower_components 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/app/node_modules 1 undefined Project: /a/app/test2.csproj WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Installing typings ["grunt","gulp"]
+TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::beginInstallTypes",
+      "eventId": 2,
+      "typingsInstallerVersion": "FakeVersion",
+      "projectName": "/a/app/test2.csproj"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "beginInstallTypes",
+      "body": {
+        "eventId": 2
+      }
+    }
+TI:: [hh:mm:ss:mss] #2 with cwd: /a/data arguments: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+After running Timeout callback:: count: 1
+
+PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@ts5.4",
+  "@types/gulp@ts5.4"
+] *new*
+
+Before running PendingInstalls callback:: count: 1
+2: #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+]
+
+TI:: Installation #2 with arguments:: [
+  "@types/grunt@tsFakeMajor.Minor",
+  "@types/gulp@tsFakeMajor.Minor"
+] complete with success::true
+//// [/a/data/node_modules/@types/grunt/index.d.ts]
+declare const grunt: { x: number }
+
+//// [/a/data/node_modules/@types/gulp/index.d.ts]
+declare const gulp: { x: number }
+
+
+TI:: [hh:mm:ss:mss] Installed typings ["@types/grunt@tsFakeMajor.Minor","@types/gulp@tsFakeMajor.Minor"]
+TI:: [hh:mm:ss:mss] Installed typing files ["/a/data/node_modules/@types/grunt/index.d.ts","/a/data/node_modules/@types/gulp/index.d.ts"]
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "projectName": "/a/app/test2.csproj",
+      "typeAcquisition": {
+        "include": [
+          "grunt",
+          "gulp"
+        ],
+        "exclude": [],
+        "enable": true
+      },
+      "compilerOptions": {
+        "allowJS": true,
+        "moduleResolution": 2,
+        "allowNonTsExtensions": true,
+        "noEmitForJsFiles": true
+      },
+      "typings": [
+        "/a/data/node_modules/@types/grunt/index.d.ts",
+        "/a/data/node_modules/@types/gulp/index.d.ts"
+      ],
+      "unresolvedImports": [],
+      "kind": "action::set"
+    }
+Info seq  [hh:mm:ss:mss] Scheduled: /a/app/test2.csproj
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "setTypings",
+      "body": {
+        "projectName": "/a/app/test2.csproj",
+        "typeAcquisition": {
+          "include": [
+            "grunt",
+            "gulp"
+          ],
+          "exclude": [],
+          "enable": true
+        },
+        "compilerOptions": {
+          "allowJS": true,
+          "moduleResolution": 2,
+          "allowNonTsExtensions": true,
+          "noEmitForJsFiles": true
+        },
+        "typings": [
+          "/a/data/node_modules/@types/grunt/index.d.ts",
+          "/a/data/node_modules/@types/gulp/index.d.ts"
+        ],
+        "unresolvedImports": [],
+        "kind": "action::set"
+      }
+    }
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] TIAdapter:: Received response:
+    {
+      "kind": "event::endInstallTypes",
+      "eventId": 2,
+      "projectName": "/a/app/test2.csproj",
+      "packagesToInstall": [
+        "@types/grunt@tsFakeMajor.Minor",
+        "@types/gulp@tsFakeMajor.Minor"
+      ],
+      "installSuccess": true,
+      "typingsInstallerVersion": "FakeVersion"
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "endInstallTypes",
+      "body": {
+        "eventId": 2,
+        "packages": [
+          "@types/grunt@tsFakeMajor.Minor",
+          "@types/gulp@tsFakeMajor.Minor"
+        ],
+        "success": true
+      }
+    }
+After running PendingInstalls callback:: count: 0
+
+Timeout callback:: count: 2
+2: /a/app/test1.csproj
+4: /a/app/test2.csproj *new*
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
index 5d075030e57..42ac818ff87 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
@@ -108,12 +108,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "c:/myprojects/project",
-      "cachePath": "c:/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path 'c:/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location 'c:/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -310,12 +306,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "//vda1cs4850/myprojects/project",
-      "cachePath": "//vda1cs4850/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '//vda1cs4850/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '//vda1cs4850/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -520,12 +512,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "//vda1cs4850/c$/myprojects/project",
-      "cachePath": "//vda1cs4850/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '//vda1cs4850/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '//vda1cs4850/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -738,12 +726,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "c:/users/username/myprojects/project",
-      "cachePath": "c:/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path 'c:/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location 'c:/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []
@@ -956,12 +940,8 @@ TI:: [hh:mm:ss:mss] Got install request
       },
       "unresolvedImports": [],
       "projectRootPath": "//vda1cs4850/c$/users/username/myprojects/project",
-      "cachePath": "//vda1cs4850/a/data",
       "kind": "discover"
     }
-TI:: [hh:mm:ss:mss] Request specifies cache path '//vda1cs4850/a/data', loading cached information...
-TI:: [hh:mm:ss:mss] Processing cache location '//vda1cs4850/a/data'
-TI:: [hh:mm:ss:mss] Cache location was already processed...
 TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json'
 TI:: [hh:mm:ss:mss] Explicitly included types: []
 TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: []