diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c2d8af2409ed3..0ca3136e5f9cb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -523,7 +523,6 @@ namespace ts {
         let deferredGlobalImportMetaType: ObjectType;
         let deferredGlobalExtractSymbol: Symbol;
 
-        let deferredNodes: Map<Node> | undefined;
         const allPotentiallyUnusedIdentifiers = createMap<PotentiallyUnusedIdentifier[]>(); // key is file name
 
         let flowLoopStart = 0;
@@ -21223,6 +21222,7 @@ namespace ts {
 
         function checkFunctionExpressionOrObjectLiteralMethod(node: FunctionExpression | MethodDeclaration, checkMode?: CheckMode): Type {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
+            checkNodeDeferred(node);
 
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode === CheckMode.SkipContextSensitive && isContextSensitive(node)) {
@@ -21280,7 +21280,6 @@ namespace ts {
                         }
                     }
                     checkSignatureDeclaration(node);
-                    checkNodeDeferred(node);
                 }
             }
 
@@ -27353,14 +27352,21 @@ namespace ts {
         // determining the type of foo would cause foo to be given type any because of the recursive reference.
         // Delaying the type check of the body ensures foo has been assigned a type.
         function checkNodeDeferred(node: Node) {
-            if (deferredNodes) {
+            const enclosingFile = getSourceFileOfNode(node);
+            const links = getNodeLinks(enclosingFile);
+            if (!(links.flags & NodeCheckFlags.TypeChecked)) {
+                links.deferredNodes = links.deferredNodes || createMap();
                 const id = "" + getNodeId(node);
-                deferredNodes.set(id, node);
+                links.deferredNodes.set(id, node);
             }
         }
 
-        function checkDeferredNodes() {
-            deferredNodes!.forEach(node => {
+        function checkDeferredNodes(context: SourceFile) {
+            const links = getNodeLinks(context);
+            if (!links.deferredNodes) {
+                return;
+            }
+            links.deferredNodes.forEach(node => {
                 switch (node.kind) {
                     case SyntaxKind.FunctionExpression:
                     case SyntaxKind.ArrowFunction:
@@ -27421,10 +27427,9 @@ namespace ts {
                 clear(potentialThisCollisions);
                 clear(potentialNewTargetCollisions);
 
-                deferredNodes = createMap<Node>();
                 forEach(node.statements, checkSourceElement);
 
-                checkDeferredNodes();
+                checkDeferredNodes(node);
 
                 if (isExternalOrCommonJsModule(node)) {
                     registerForUnusedIdentifiersCheck(node);
@@ -27438,8 +27443,6 @@ namespace ts {
                     });
                 }
 
-                deferredNodes = undefined;
-
                 if (isExternalOrCommonJsModule(node)) {
                     checkExternalModuleExports(node);
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index a091228813db1..eb85d8c966a65 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3702,6 +3702,7 @@ namespace ts {
         switchTypes?: Type[];             // Cached array of switch case expression types
         jsxNamespace?: Symbol | false;          // Resolved jsx namespace symbol for this node
         contextFreeType?: Type;          // Cached context-free type used by the first pass of inference; used when a function's return is partially contextually sensitive
+        deferredNodes?: Map<Node>; // Set of nodes whose checking has been deferred
         capturedBlockScopeBindings?: Symbol[]; // Block-scoped bindings captured beneath this part of an IterationStatement
     }
 
diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
index 4ea67b5fbdd24..40bdb4eadabc9 160000
--- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+++ b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
@@ -1 +1 @@
-Subproject commit 4ea67b5fbdd2483ec1d4c75c90705bfc056f5e66
+Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6
diff --git a/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter b/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
index ef797268ddfe9..59571c0d34aa4 160000
--- a/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
+++ b/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
@@ -1 +1 @@
-Subproject commit ef797268ddfe9b2e5d2273b953eebdbffb4f734c
+Subproject commit 59571c0d34aa48820309291b966778795d1cbebf
diff --git a/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter b/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
index 1404377597038..68f60e1a4b947 160000
--- a/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
+++ b/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
@@ -1 +1 @@
-Subproject commit 1404377597038d22c9df43b49ced70bae635edba
+Subproject commit 68f60e1a4b947df47418e1d420acc59dafdfef12
diff --git a/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter b/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
index c243b11a6f827..713c6986f043f 160000
--- a/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
+++ b/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
@@ -1 +1 @@
-Subproject commit c243b11a6f827e780a5163999bc472c95ff5a0e0
+Subproject commit 713c6986f043f2c31976b8bc2c03aa0a2b05590b
diff --git a/tests/cases/user/axios-src/axios-src b/tests/cases/user/axios-src/axios-src
index 75c8b3f146aaa..0b3db5d87a60a 160000
--- a/tests/cases/user/axios-src/axios-src
+++ b/tests/cases/user/axios-src/axios-src
@@ -1 +1 @@
-Subproject commit 75c8b3f146aaa8a71f7dca0263686fb1799f8f31
+Subproject commit 0b3db5d87a60a1ad8b0dce9669dbc10483ec33da
diff --git a/tests/cases/user/create-react-app/create-react-app b/tests/cases/user/create-react-app/create-react-app
index d6682c8190406..1d4fdc2dd4950 160000
--- a/tests/cases/user/create-react-app/create-react-app
+++ b/tests/cases/user/create-react-app/create-react-app
@@ -1 +1 @@
-Subproject commit d6682c81904065676b565849a83e55f0823ecfad
+Subproject commit 1d4fdc2dd4950011beacf1883900bf5d8da7079e
diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier
index 2283efb4371c3..67f1c4877ee10 160000
--- a/tests/cases/user/prettier/prettier
+++ b/tests/cases/user/prettier/prettier
@@ -1 +1 @@
-Subproject commit 2283efb4371c30293f86e0f51a0a57bdf9606bd7
+Subproject commit 67f1c4877ee1090b66d468a847caccca411a6f82
diff --git a/tests/cases/user/puppeteer/puppeteer b/tests/cases/user/puppeteer/puppeteer
index c9657f88196dc..98bb2615adb68 160000
--- a/tests/cases/user/puppeteer/puppeteer
+++ b/tests/cases/user/puppeteer/puppeteer
@@ -1 +1 @@
-Subproject commit c9657f88196dc97b200e81418ec24b41587849cf
+Subproject commit 98bb2615adb6815c91efcc59593b49e2ec8c3935
diff --git a/tests/cases/user/webpack/webpack b/tests/cases/user/webpack/webpack
index 4c461e2e1fb1b..10282ea20648b 160000
--- a/tests/cases/user/webpack/webpack
+++ b/tests/cases/user/webpack/webpack
@@ -1 +1 @@
-Subproject commit 4c461e2e1fb1b0ed7a66cf5a32b72824690c79d8
+Subproject commit 10282ea20648b465caec6448849f24fc34e1ba3e