diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index c2fcbddaa61..be8f4d6f0cb 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -149,6 +149,7 @@ namespace ts {
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
+            return undefined;
         });
         return typeRoots;
     }
@@ -237,7 +238,8 @@ namespace ts {
                 if (traceEnabled) {
                     trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                const result = loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*cache*/ undefined);
+                resolvedFile = resolvedTypeScriptOnly(result && result.value);
                 if (!resolvedFile && traceEnabled) {
                     trace(host, Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
@@ -293,24 +295,120 @@ namespace ts {
      * Cached module resolutions per containing directory.
      * This assumes that any module id will have the same resolution for sibling files located in the same folder.
      */
-    export interface ModuleResolutionCache {
+    export interface ModuleResolutionCache extends NonRelativeModuleNameResolutionCache {
         getOrCreateCacheForDirectory(directoryName: string): Map<ResolvedModuleWithFailedLookupLocations>;
     }
 
-    export function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string) {
-        const map = createFileMap<Map<ResolvedModuleWithFailedLookupLocations>>();
+    /**
+     * Stored map from non-relative module name to a table: directory -> result of module lookup in this directory
+     * We support only non-relative module names because resolution of relative module names is usually more deterministic and thus less expensive.
+     */
+    export interface NonRelativeModuleNameResolutionCache {
+        getOrCreateCacheForModuleName(nonRelativeModuleName: string): PerModuleNameCache;
+    }
 
-        return { getOrCreateCacheForDirectory };
+    export interface PerModuleNameCache {
+        get(directory: string): ResolvedModuleWithFailedLookupLocations;
+        set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
+    }
+
+    export function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache {
+        const directoryToModuleNameMap = createFileMap<Map<ResolvedModuleWithFailedLookupLocations>>();
+        const moduleNameToDirectoryMap = createMap<PerModuleNameCache>();
+
+        return { getOrCreateCacheForDirectory, getOrCreateCacheForModuleName };
 
         function getOrCreateCacheForDirectory(directoryName: string) {
             const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
-            let perFolderCache = map.get(path);
+            let perFolderCache = directoryToModuleNameMap.get(path);
             if (!perFolderCache) {
                 perFolderCache = createMap<ResolvedModuleWithFailedLookupLocations>();
-                map.set(path, perFolderCache);
+                directoryToModuleNameMap.set(path, perFolderCache);
             }
             return perFolderCache;
         }
+
+        function getOrCreateCacheForModuleName(nonRelativeModuleName: string) {
+            if (!moduleHasNonRelativeName(nonRelativeModuleName)) {
+                return undefined;
+            }
+            let perModuleNameCache = moduleNameToDirectoryMap[nonRelativeModuleName];
+            if (!perModuleNameCache) {
+                moduleNameToDirectoryMap[nonRelativeModuleName] = perModuleNameCache = createPerModuleNameCache();
+            }
+            return perModuleNameCache;
+        }
+
+        function createPerModuleNameCache(): PerModuleNameCache {
+            const directoryPathMap = createFileMap<ResolvedModuleWithFailedLookupLocations>();
+
+            return { get, set };
+
+            function get(directory: string): ResolvedModuleWithFailedLookupLocations {
+                return directoryPathMap.get(toPath(directory, currentDirectory, getCanonicalFileName));
+            }
+
+            /**
+             * At first this function add entry directory -> module resolution result to the table.
+             * Then it computes the set of parent folders for 'directory' that should have the same module resolution result
+             * and for every parent folder in set it adds entry: parent -> module resolution. .
+             * Lets say we first directory name: /a/b/c/d/e and resolution result is: /a/b/bar.ts.
+             * Set of parent folders that should have the same result will be: 
+             * [
+             *     /a/b/c/d, /a/b/c, /a/b
+             * ]
+             * this means that request for module resolution from file in any of these folder will be immediately found in cache.
+             */
+            function set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void {
+                const path = toPath(directory, currentDirectory, getCanonicalFileName);
+                // if entry is already in cache do nothing
+                if (directoryPathMap.contains(path)) {
+                    return;
+                }
+                directoryPathMap.set(path, result);
+
+                const resolvedFileName = result.resolvedModule && result.resolvedModule.resolvedFileName;
+                // find common prefix between directory and resolved file name
+                // this common prefix should be the shorted path that has the same resolution
+                // directory: /a/b/c/d/e
+                // resolvedFileName: /a/b/foo.d.ts
+                const commonPrefix = getCommonPrefix(path, resolvedFileName);
+                let current = path;
+                while (true) {
+                    const parent = getDirectoryPath(current);
+                    if (parent === current || directoryPathMap.contains(parent)) {
+                        break;
+                    }
+                    directoryPathMap.set(parent, result);
+                    current = parent;
+
+                    if (current == commonPrefix) {
+                        break;
+                    }
+                }
+            }
+            
+            function getCommonPrefix(directory: Path, resolution: string) {
+                if (resolution === undefined) {
+                    return undefined;
+                }
+                const resolutionDirectory = toPath(getDirectoryPath(resolution), currentDirectory, getCanonicalFileName);
+
+                // find first position where directory and resolution differs
+                let i = 0;
+                while (i < Math.min(directory.length, resolutionDirectory.length) && directory.charCodeAt(i) === resolutionDirectory.charCodeAt(i)) {
+                    i++;
+                }
+
+                // find last directory separator before position i
+                const sep = directory.lastIndexOf(directorySeparator, i);
+                if (sep < 0) {
+                    return undefined;
+                }
+
+                return directory.substr(0, sep);
+            }
+        }
     }
 
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
@@ -318,7 +416,8 @@ namespace ts {
         if (traceEnabled) {
             trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
         }
-        const perFolderCache = cache && cache.getOrCreateCacheForDirectory(getDirectoryPath(containingFile));
+        const containingDirectory = getDirectoryPath(containingFile);
+        let perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
         let result = perFolderCache && perFolderCache[moduleName];
 
         if (result) {
@@ -342,15 +441,20 @@ namespace ts {
 
             switch (moduleResolution) {
                 case ModuleResolutionKind.NodeJs:
-                    result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                    result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache);
                     break;
                 case ModuleResolutionKind.Classic:
-                    result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                    result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache);
                     break;
             }
 
             if (perFolderCache) {
                 perFolderCache[moduleName] = result;
+                // put result in per-module name cache
+                const perModuleNameCache = cache.getOrCreateCacheForModuleName(moduleName);
+                if (perModuleNameCache) {
+                    perModuleNameCache.set(containingDirectory, result);
+                }
             }
         }
 
@@ -574,7 +678,7 @@ namespace ts {
         }
     }
 
-    export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
+    export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
         const containingDirectory = getDirectoryPath(containingFile);
         const traceEnabled = isTraceEnabled(compilerOptions, host);
 
@@ -582,30 +686,30 @@ namespace ts {
         const state: ModuleResolutionState = { compilerOptions, host, traceEnabled };
 
         const result = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
-        if (result) {
-            const { resolved, isExternalLibraryImport } = result;
+        if (result && result.value) {
+            const { resolved, isExternalLibraryImport } = result.value;
             return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
         }
         return { resolvedModule: undefined, failedLookupLocations };
 
-        function tryResolve(extensions: Extensions): { resolved: Resolved, isExternalLibraryImport: boolean } | undefined {
+        function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, isExternalLibraryImport: boolean }> {
             const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
             if (resolved) {
-                return { resolved, isExternalLibraryImport: false };
+                return toSearchResult({ resolved, isExternalLibraryImport: false });
             }
 
             if (moduleHasNonRelativeName(moduleName)) {
                 if (traceEnabled) {
                     trace(host, Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state, cache);
                 // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
-                return resolved && { resolved: { path: realpath(resolved.path, host, traceEnabled), extension: resolved.extension }, isExternalLibraryImport: true };
+                return resolved && { value: resolved.value && { resolved: { path: realpath(resolved.value.path, host, traceEnabled), extension: resolved.value.extension }, isExternalLibraryImport: true } };
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
                 const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-                return resolved && { resolved, isExternalLibraryImport: false };
+                return resolved && toSearchResult({ resolved, isExternalLibraryImport: false });
             }
         }
     }
@@ -775,18 +879,23 @@ namespace ts {
             loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
 
-    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
-        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false);
+    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState, cache: NonRelativeModuleNameResolutionCache): SearchResult<Resolved> {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false, cache);
     }
-    function loadModuleFromNodeModulesAtTypes(moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
+    function loadModuleFromNodeModulesAtTypes(moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): SearchResult<Resolved> {
         // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
-        return loadModuleFromNodeModulesWorker(Extensions.DtsOnly, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true);
+        return loadModuleFromNodeModulesWorker(Extensions.DtsOnly, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true, /*cache*/ undefined);
     }
 
-    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState, typesOnly: boolean): Resolved | undefined {
+    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState, typesOnly: boolean, cache: NonRelativeModuleNameResolutionCache): SearchResult<Resolved> {
+        const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
         return forEachAncestorDirectory(normalizeSlashes(directory), ancestorDirectory => {
             if (getBaseFileName(ancestorDirectory) !== "node_modules") {
-                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
+                const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state.traceEnabled, state.host);
+                if (resolutionFromCache) {
+                    return resolutionFromCache;
+                }
+                return toSearchResult(loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly));
             }
         });
     }
@@ -802,26 +911,41 @@ namespace ts {
         }
     }
 
-    export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
+    function tryFindNonRelativeModuleNameInCache(cache: PerModuleNameCache | undefined, moduleName: string, containingDirectory: string, traceEnabled: boolean, host: ModuleResolutionHost): SearchResult<Resolved> {
+        const result = cache && cache.get(containingDirectory);
+        if (result) {
+            if (traceEnabled) {
+                trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName)
+            }
+            return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension } };
+        }
+    }
+
+    export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache): ResolvedModuleWithFailedLookupLocations {
         const traceEnabled = isTraceEnabled(compilerOptions, host);
         const state: ModuleResolutionState = { compilerOptions, host, traceEnabled };
         const failedLookupLocations: string[] = [];
         const containingDirectory = getDirectoryPath(containingFile);
 
         const resolved = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
-        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, /*isExternalLibraryImport*/ false, failedLookupLocations);
 
-        function tryResolve(extensions: Extensions): Resolved | undefined {
+        function tryResolve(extensions: Extensions): SearchResult<Resolved> {
             const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
             if (resolvedUsingSettings) {
-                return resolvedUsingSettings;
+                return { value: resolvedUsingSettings };
             }
+            const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName);
 
             if (moduleHasNonRelativeName(moduleName)) {
                 // Climb up parent directories looking for a module.
                 const resolved = forEachAncestorDirectory(containingDirectory, directory => {
+                    const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, traceEnabled, host);
+                    if (resolutionFromCache) {
+                        return resolutionFromCache;
+                    }
                     const searchName = normalizePath(combinePaths(directory, moduleName));
-                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                    return toSearchResult(loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state));
                 });
                 if (resolved) {
                     return resolved;
@@ -833,7 +957,7 @@ namespace ts {
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
-                return loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                return toSearchResult(loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state));
             }
         }
     }
@@ -854,8 +978,28 @@ namespace ts {
         return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
     }
 
+    /**
+     * Represents result of search. Normally when searching among several alternatives we treat value `undefined` as indicator
+     * that search fails and we should try another option. 
+     * However this does not allow us to represent final result that should be used instead of further searching (i.e. a final result that was found in cache).
+     * SearchResult is used to deal with this issue, its values represents following outcomes:
+     * - undefined - not found, continue searching
+     * - { value: undefined } - not found - stop searching
+     * - { value: <some-value> } - found - stop searching
+     */
+    type SearchResult<T> = { value: T | undefined } | undefined;
+    
+    /**
+     * Wraps value to SearchResult.
+     * @returns undefined if value is undefined or { value } otherwise
+     */
+    function toSearchResult<T>(value: T | undefined): SearchResult<T> {
+        return value !== undefined ? { value } : undefined;
+    }
+
+
     /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
-    function forEachAncestorDirectory<T>(directory: string, callback: (directory: string) => T | undefined): T | undefined {
+    function forEachAncestorDirectory<T>(directory: string, callback: (directory: string) => SearchResult<T>): SearchResult<T> {
         while (true) {
             const result = callback(directory);
             if (result !== undefined) {
diff --git a/tests/baselines/reference/cachedModuleResolution1.js b/tests/baselines/reference/cachedModuleResolution1.js
new file mode 100644
index 00000000000..9071b60d6c1
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution1.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/cachedModuleResolution1.ts] ////
+
+//// [foo.d.ts]
+
+export declare let x: number
+
+//// [app.ts]
+import {x} from "foo";
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.js]
+"use strict";
+//// [lib.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution1.symbols b/tests/baselines/reference/cachedModuleResolution1.symbols
new file mode 100644
index 00000000000..f7d3c474a56
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution1.symbols
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : Symbol(x, Decl(foo.d.ts, 1, 18))
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(lib.ts, 0, 8))
+
diff --git a/tests/baselines/reference/cachedModuleResolution1.trace.json b/tests/baselines/reference/cachedModuleResolution1.trace.json
new file mode 100644
index 00000000000..dbb0e6068be
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution1.trace.json
@@ -0,0 +1,46 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo.ts' does not exist.",
+    "File '/a/b/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/node_modules/foo.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "Resolution for module 'foo' was found in cache",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution1.types b/tests/baselines/reference/cachedModuleResolution1.types
new file mode 100644
index 00000000000..c041e8cc340
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution1.types
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : number
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : number
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : number
+
diff --git a/tests/baselines/reference/cachedModuleResolution2.js b/tests/baselines/reference/cachedModuleResolution2.js
new file mode 100644
index 00000000000..7c84a92abaf
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution2.js
@@ -0,0 +1,17 @@
+//// [tests/cases/compiler/cachedModuleResolution2.ts] ////
+
+//// [foo.d.ts]
+
+export declare let x: number
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.ts]
+import {x} from "foo";
+
+
+//// [lib.js]
+"use strict";
+//// [app.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution2.symbols b/tests/baselines/reference/cachedModuleResolution2.symbols
new file mode 100644
index 00000000000..c8356eadb11
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution2.symbols
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : Symbol(x, Decl(foo.d.ts, 1, 18))
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(lib.ts, 0, 8))
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
diff --git a/tests/baselines/reference/cachedModuleResolution2.trace.json b/tests/baselines/reference/cachedModuleResolution2.trace.json
new file mode 100644
index 00000000000..1d4b40bbc08
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution2.trace.json
@@ -0,0 +1,46 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo.ts' does not exist.",
+    "File '/a/b/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/node_modules/foo.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "Resolution for module 'foo' was found in cache",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution2.types b/tests/baselines/reference/cachedModuleResolution2.types
new file mode 100644
index 00000000000..c5069e681c4
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution2.types
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : number
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : number
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : number
+
diff --git a/tests/baselines/reference/cachedModuleResolution3.js b/tests/baselines/reference/cachedModuleResolution3.js
new file mode 100644
index 00000000000..032c1afee0e
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution3.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/cachedModuleResolution3.ts] ////
+
+//// [foo.d.ts]
+
+export declare let x: number
+
+//// [app.ts]
+import {x} from "foo";
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.js]
+"use strict";
+//// [lib.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution3.symbols b/tests/baselines/reference/cachedModuleResolution3.symbols
new file mode 100644
index 00000000000..799ac6d8d84
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution3.symbols
@@ -0,0 +1,13 @@
+=== /a/b/foo.d.ts ===
+
+export declare let x: number
+>x : Symbol(x, Decl(foo.d.ts, 1, 18))
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(lib.ts, 0, 8))
+
diff --git a/tests/baselines/reference/cachedModuleResolution3.trace.json b/tests/baselines/reference/cachedModuleResolution3.trace.json
new file mode 100644
index 00000000000..2dbaea53f47
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution3.trace.json
@@ -0,0 +1,21 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/d/e/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/foo.ts' does not exist.",
+    "File '/a/b/c/d/foo.tsx' does not exist.",
+    "File '/a/b/c/d/foo.d.ts' does not exist.",
+    "File '/a/b/c/foo.ts' does not exist.",
+    "File '/a/b/c/foo.tsx' does not exist.",
+    "File '/a/b/c/foo.d.ts' does not exist.",
+    "File '/a/b/foo.ts' does not exist.",
+    "File '/a/b/foo.tsx' does not exist.",
+    "File '/a/b/foo.d.ts' exist - use it as a name resolution result.",
+    "======== Module name 'foo' was successfully resolved to '/a/b/foo.d.ts'. ========",
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was successfully resolved to '/a/b/foo.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution3.types b/tests/baselines/reference/cachedModuleResolution3.types
new file mode 100644
index 00000000000..f87abf1519e
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution3.types
@@ -0,0 +1,13 @@
+=== /a/b/foo.d.ts ===
+
+export declare let x: number
+>x : number
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : number
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : number
+
diff --git a/tests/baselines/reference/cachedModuleResolution4.js b/tests/baselines/reference/cachedModuleResolution4.js
new file mode 100644
index 00000000000..6089de9706b
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution4.js
@@ -0,0 +1,17 @@
+//// [tests/cases/compiler/cachedModuleResolution4.ts] ////
+
+//// [foo.d.ts]
+
+export declare let x: number
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.ts]
+import {x} from "foo";
+
+
+//// [lib.js]
+"use strict";
+//// [app.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution4.symbols b/tests/baselines/reference/cachedModuleResolution4.symbols
new file mode 100644
index 00000000000..a30e6bf74e5
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution4.symbols
@@ -0,0 +1,13 @@
+=== /a/b/foo.d.ts ===
+
+export declare let x: number
+>x : Symbol(x, Decl(foo.d.ts, 1, 18))
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(lib.ts, 0, 8))
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
diff --git a/tests/baselines/reference/cachedModuleResolution4.trace.json b/tests/baselines/reference/cachedModuleResolution4.trace.json
new file mode 100644
index 00000000000..7249d948e1c
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution4.trace.json
@@ -0,0 +1,21 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/foo.ts' does not exist.",
+    "File '/a/b/c/foo.tsx' does not exist.",
+    "File '/a/b/c/foo.d.ts' does not exist.",
+    "File '/a/b/foo.ts' does not exist.",
+    "File '/a/b/foo.tsx' does not exist.",
+    "File '/a/b/foo.d.ts' exist - use it as a name resolution result.",
+    "======== Module name 'foo' was successfully resolved to '/a/b/foo.d.ts'. ========",
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/d/e/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/foo.ts' does not exist.",
+    "File '/a/b/c/d/foo.tsx' does not exist.",
+    "File '/a/b/c/d/foo.d.ts' does not exist.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was successfully resolved to '/a/b/foo.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution4.types b/tests/baselines/reference/cachedModuleResolution4.types
new file mode 100644
index 00000000000..3689e57ca6d
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution4.types
@@ -0,0 +1,13 @@
+=== /a/b/foo.d.ts ===
+
+export declare let x: number
+>x : number
+
+=== /a/b/c/lib.ts ===
+import {x} from "foo";
+>x : number
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : number
+
diff --git a/tests/baselines/reference/cachedModuleResolution5.js b/tests/baselines/reference/cachedModuleResolution5.js
new file mode 100644
index 00000000000..33561e8eae2
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution5.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/cachedModuleResolution5.ts] ////
+
+//// [foo.d.ts]
+
+export declare let x: number
+
+//// [app.ts]
+import {x} from "foo";
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.js]
+"use strict";
+//// [lib.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution5.symbols b/tests/baselines/reference/cachedModuleResolution5.symbols
new file mode 100644
index 00000000000..eb72f0c7a27
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution5.symbols
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : Symbol(x, Decl(foo.d.ts, 1, 18))
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
+=== /a/b/lib.ts ===
+import {x} from "foo";
+>x : Symbol(x, Decl(lib.ts, 0, 8))
+
diff --git a/tests/baselines/reference/cachedModuleResolution5.trace.json b/tests/baselines/reference/cachedModuleResolution5.trace.json
new file mode 100644
index 00000000000..d263465ff12
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution5.trace.json
@@ -0,0 +1,46 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo.ts' does not exist.",
+    "File '/a/b/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/node_modules/foo.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
+    "======== Resolving module 'foo' from '/a/b/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "Resolution for module 'foo' was found in cache",
+    "Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'",
+    "======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution5.types b/tests/baselines/reference/cachedModuleResolution5.types
new file mode 100644
index 00000000000..ad2640402f7
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution5.types
@@ -0,0 +1,13 @@
+=== /a/b/node_modules/foo.d.ts ===
+
+export declare let x: number
+>x : number
+
+=== /a/b/c/d/e/app.ts ===
+import {x} from "foo";
+>x : number
+
+=== /a/b/lib.ts ===
+import {x} from "foo";
+>x : number
+
diff --git a/tests/baselines/reference/cachedModuleResolution6.errors.txt b/tests/baselines/reference/cachedModuleResolution6.errors.txt
new file mode 100644
index 00000000000..b272ff29b9d
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution6.errors.txt
@@ -0,0 +1,14 @@
+/a/b/c/d/e/app.ts(2,17): error TS2307: Cannot find module 'foo'.
+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo'.
+
+
+==== /a/b/c/d/e/app.ts (1 errors) ====
+    
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+==== /a/b/c/lib.ts (1 errors) ====
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution6.js b/tests/baselines/reference/cachedModuleResolution6.js
new file mode 100644
index 00000000000..f21f491a921
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution6.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/cachedModuleResolution6.ts] ////
+
+//// [app.ts]
+
+import {x} from "foo";
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.js]
+"use strict";
+//// [lib.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution6.trace.json b/tests/baselines/reference/cachedModuleResolution6.trace.json
new file mode 100644
index 00000000000..02d52befc94
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution6.trace.json
@@ -0,0 +1,102 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo.ts' does not exist.",
+    "File '/a/b/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/foo.ts' does not exist.",
+    "File '/a/node_modules/foo.tsx' does not exist.",
+    "File '/a/node_modules/foo.d.ts' does not exist.",
+    "File '/a/node_modules/foo/package.json' does not exist.",
+    "File '/a/node_modules/foo/index.ts' does not exist.",
+    "File '/a/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "File '/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' does not exist.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.js' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.js' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.js' does not exist.",
+    "File '/a/b/c/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/b/node_modules/foo.js' does not exist.",
+    "File '/a/b/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/node_modules/foo.js' does not exist.",
+    "File '/a/node_modules/foo.jsx' does not exist.",
+    "File '/a/node_modules/foo/package.json' does not exist.",
+    "File '/a/node_modules/foo/index.js' does not exist.",
+    "File '/a/node_modules/foo/index.jsx' does not exist.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.js' does not exist.",
+    "File '/node_modules/foo/index.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========",
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution7.errors.txt b/tests/baselines/reference/cachedModuleResolution7.errors.txt
new file mode 100644
index 00000000000..670c4a665a6
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution7.errors.txt
@@ -0,0 +1,15 @@
+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo'.
+/a/b/c/lib.ts(2,17): error TS2307: Cannot find module 'foo'.
+
+
+==== /a/b/c/lib.ts (1 errors) ====
+    
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+==== /a/b/c/d/e/app.ts (1 errors) ====
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution7.js b/tests/baselines/reference/cachedModuleResolution7.js
new file mode 100644
index 00000000000..8b86dcd55af
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution7.js
@@ -0,0 +1,14 @@
+//// [tests/cases/compiler/cachedModuleResolution7.ts] ////
+
+//// [lib.ts]
+
+import {x} from "foo";
+
+//// [app.ts]
+import {x} from "foo";
+
+
+//// [lib.js]
+"use strict";
+//// [app.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution7.trace.json b/tests/baselines/reference/cachedModuleResolution7.trace.json
new file mode 100644
index 00000000000..ce5bf08861d
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution7.trace.json
@@ -0,0 +1,92 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo.ts' does not exist.",
+    "File '/a/b/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/foo.ts' does not exist.",
+    "File '/a/node_modules/foo.tsx' does not exist.",
+    "File '/a/node_modules/foo.d.ts' does not exist.",
+    "File '/a/node_modules/foo/package.json' does not exist.",
+    "File '/a/node_modules/foo/index.ts' does not exist.",
+    "File '/a/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "File '/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' does not exist.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/node_modules/foo.js' does not exist.",
+    "File '/a/b/c/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/c/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/c/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/b/node_modules/foo.js' does not exist.",
+    "File '/a/b/node_modules/foo.jsx' does not exist.",
+    "File '/a/b/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/foo/index.js' does not exist.",
+    "File '/a/b/node_modules/foo/index.jsx' does not exist.",
+    "File '/a/node_modules/foo.js' does not exist.",
+    "File '/a/node_modules/foo.jsx' does not exist.",
+    "File '/a/node_modules/foo/package.json' does not exist.",
+    "File '/a/node_modules/foo/index.js' does not exist.",
+    "File '/a/node_modules/foo/index.jsx' does not exist.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.js' does not exist.",
+    "File '/node_modules/foo/index.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========",
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/a/b/c/d/e/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/e/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.tsx' does not exist.",
+    "File '/a/b/c/d/node_modules/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution8.errors.txt b/tests/baselines/reference/cachedModuleResolution8.errors.txt
new file mode 100644
index 00000000000..b272ff29b9d
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution8.errors.txt
@@ -0,0 +1,14 @@
+/a/b/c/d/e/app.ts(2,17): error TS2307: Cannot find module 'foo'.
+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo'.
+
+
+==== /a/b/c/d/e/app.ts (1 errors) ====
+    
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+==== /a/b/c/lib.ts (1 errors) ====
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution8.js b/tests/baselines/reference/cachedModuleResolution8.js
new file mode 100644
index 00000000000..1c00b171f21
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution8.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/cachedModuleResolution8.ts] ////
+
+//// [app.ts]
+
+import {x} from "foo";
+
+//// [lib.ts]
+import {x} from "foo";
+
+//// [app.js]
+"use strict";
+//// [lib.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution8.trace.json b/tests/baselines/reference/cachedModuleResolution8.trace.json
new file mode 100644
index 00000000000..f833f56d819
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution8.trace.json
@@ -0,0 +1,57 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/d/e/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/foo.ts' does not exist.",
+    "File '/a/b/c/d/foo.tsx' does not exist.",
+    "File '/a/b/c/d/foo.d.ts' does not exist.",
+    "File '/a/b/c/foo.ts' does not exist.",
+    "File '/a/b/c/foo.tsx' does not exist.",
+    "File '/a/b/c/foo.d.ts' does not exist.",
+    "File '/a/b/foo.ts' does not exist.",
+    "File '/a/b/foo.tsx' does not exist.",
+    "File '/a/b/foo.d.ts' does not exist.",
+    "File '/a/foo.ts' does not exist.",
+    "File '/a/foo.tsx' does not exist.",
+    "File '/a/foo.d.ts' does not exist.",
+    "File '/foo.ts' does not exist.",
+    "File '/foo.tsx' does not exist.",
+    "File '/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/e/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/d/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/d/e/foo.js' does not exist.",
+    "File '/a/b/c/d/e/foo.jsx' does not exist.",
+    "File '/a/b/c/d/foo.js' does not exist.",
+    "File '/a/b/c/d/foo.jsx' does not exist.",
+    "File '/a/b/c/foo.js' does not exist.",
+    "File '/a/b/c/foo.jsx' does not exist.",
+    "File '/a/b/foo.js' does not exist.",
+    "File '/a/b/foo.jsx' does not exist.",
+    "File '/a/foo.js' does not exist.",
+    "File '/a/foo.jsx' does not exist.",
+    "File '/foo.js' does not exist.",
+    "File '/foo.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========",
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution9.errors.txt b/tests/baselines/reference/cachedModuleResolution9.errors.txt
new file mode 100644
index 00000000000..aeec41f0048
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution9.errors.txt
@@ -0,0 +1,16 @@
+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo'.
+/a/b/c/lib.ts(2,17): error TS2307: Cannot find module 'foo'.
+
+
+==== /a/b/c/lib.ts (1 errors) ====
+    
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+    
+==== /a/b/c/d/e/app.ts (1 errors) ====
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution9.js b/tests/baselines/reference/cachedModuleResolution9.js
new file mode 100644
index 00000000000..32f8848736c
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution9.js
@@ -0,0 +1,15 @@
+//// [tests/cases/compiler/cachedModuleResolution9.ts] ////
+
+//// [lib.ts]
+
+import {x} from "foo";
+
+
+//// [app.ts]
+import {x} from "foo";
+
+
+//// [lib.js]
+"use strict";
+//// [app.js]
+"use strict";
diff --git a/tests/baselines/reference/cachedModuleResolution9.trace.json b/tests/baselines/reference/cachedModuleResolution9.trace.json
new file mode 100644
index 00000000000..10a79576bfc
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution9.trace.json
@@ -0,0 +1,47 @@
+[
+    "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/foo.ts' does not exist.",
+    "File '/a/b/c/foo.tsx' does not exist.",
+    "File '/a/b/c/foo.d.ts' does not exist.",
+    "File '/a/b/foo.ts' does not exist.",
+    "File '/a/b/foo.tsx' does not exist.",
+    "File '/a/b/foo.d.ts' does not exist.",
+    "File '/a/foo.ts' does not exist.",
+    "File '/a/foo.tsx' does not exist.",
+    "File '/a/foo.d.ts' does not exist.",
+    "File '/foo.ts' does not exist.",
+    "File '/foo.tsx' does not exist.",
+    "File '/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/c/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/a/node_modules/@types/foo/package.json' does not exist.",
+    "File '/a/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/a/b/c/foo.js' does not exist.",
+    "File '/a/b/c/foo.jsx' does not exist.",
+    "File '/a/b/foo.js' does not exist.",
+    "File '/a/b/foo.jsx' does not exist.",
+    "File '/a/foo.js' does not exist.",
+    "File '/a/foo.jsx' does not exist.",
+    "File '/foo.js' does not exist.",
+    "File '/foo.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========",
+    "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
+    "Explicitly specified module resolution kind: 'Classic'.",
+    "File '/a/b/c/d/e/foo.ts' does not exist.",
+    "File '/a/b/c/d/e/foo.tsx' does not exist.",
+    "File '/a/b/c/d/e/foo.d.ts' does not exist.",
+    "File '/a/b/c/d/foo.ts' does not exist.",
+    "File '/a/b/c/d/foo.tsx' does not exist.",
+    "File '/a/b/c/d/foo.d.ts' does not exist.",
+    "Resolution for module 'foo' was found in cache",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution1.ts b/tests/cases/compiler/cachedModuleResolution1.ts
new file mode 100644
index 00000000000..3ef09ea0ea5
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution1.ts
@@ -0,0 +1,11 @@
+// @moduleResolution: node
+// @traceResolution: true
+
+// @filename: /a/b/node_modules/foo.d.ts
+export declare let x: number
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution2.ts b/tests/cases/compiler/cachedModuleResolution2.ts
new file mode 100644
index 00000000000..38aaf4e609d
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution2.ts
@@ -0,0 +1,11 @@
+// @moduleResolution: node
+// @traceResolution: true
+
+// @filename: /a/b/node_modules/foo.d.ts
+export declare let x: number
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
diff --git a/tests/cases/compiler/cachedModuleResolution3.ts b/tests/cases/compiler/cachedModuleResolution3.ts
new file mode 100644
index 00000000000..e1e7aebbe86
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution3.ts
@@ -0,0 +1,11 @@
+// @moduleResolution: classic
+// @traceResolution: true
+
+// @filename: /a/b/foo.d.ts
+export declare let x: number
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution4.ts b/tests/cases/compiler/cachedModuleResolution4.ts
new file mode 100644
index 00000000000..98cdd14189a
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution4.ts
@@ -0,0 +1,11 @@
+// @moduleResolution: classic
+// @traceResolution: true
+
+// @filename: /a/b/foo.d.ts
+export declare let x: number
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
diff --git a/tests/cases/compiler/cachedModuleResolution5.ts b/tests/cases/compiler/cachedModuleResolution5.ts
new file mode 100644
index 00000000000..e37b14fc1a0
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution5.ts
@@ -0,0 +1,11 @@
+// @moduleResolution: node
+// @traceResolution: true
+
+// @filename: /a/b/node_modules/foo.d.ts
+export declare let x: number
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
+
+// @filename: /a/b/lib.ts
+import {x} from "foo";
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution6.ts b/tests/cases/compiler/cachedModuleResolution6.ts
new file mode 100644
index 00000000000..2c412e361c6
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution6.ts
@@ -0,0 +1,8 @@
+// @moduleResolution: node
+// @traceResolution: true
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution7.ts b/tests/cases/compiler/cachedModuleResolution7.ts
new file mode 100644
index 00000000000..d297e2a8ecd
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution7.ts
@@ -0,0 +1,8 @@
+// @moduleResolution: node
+// @traceResolution: true
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
diff --git a/tests/cases/compiler/cachedModuleResolution8.ts b/tests/cases/compiler/cachedModuleResolution8.ts
new file mode 100644
index 00000000000..52c91be7753
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution8.ts
@@ -0,0 +1,8 @@
+// @moduleResolution: classic
+// @traceResolution: true
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
\ No newline at end of file
diff --git a/tests/cases/compiler/cachedModuleResolution9.ts b/tests/cases/compiler/cachedModuleResolution9.ts
new file mode 100644
index 00000000000..26d71fa86ff
--- /dev/null
+++ b/tests/cases/compiler/cachedModuleResolution9.ts
@@ -0,0 +1,9 @@
+// @moduleResolution: classic
+// @traceResolution: true
+
+// @filename: /a/b/c/lib.ts
+import {x} from "foo";
+
+
+// @filename: /a/b/c/d/e/app.ts
+import {x} from "foo";