diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index aede2cf437b..5ae7bda1dc6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -185,7 +185,7 @@ public void Basic_Runtime()
         AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void Sections_Runtime()
     {
         // Arrange
@@ -319,7 +319,7 @@ public void Model_Runtime()
         AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void ModelExpressionTagHelper_Runtime()
     {
         // Arrange
@@ -342,7 +342,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
         AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void RazorPages_Runtime()
     {
         // Arrange
@@ -377,7 +377,7 @@ public void RazorPagesWithRouteTemplate_Runtime()
         AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void RazorPagesWithoutModel_Runtime()
     {
         // Arrange
@@ -426,7 +426,7 @@ public void ViewWithNamespace_Runtime()
         AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void ViewComponentTagHelper_Runtime()
     {
         // Arrange
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
index 6af3b8e5e75..41aa60b9d18 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -18,13 +18,13 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -36,7 +36,7 @@
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
                             IntermediateToken -  - CSharp - __model.
-                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            LazyIntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
                 CSharpCode - 
@@ -44,7 +44,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(91, 2, true);
                 HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -55,7 +55,7 @@
                     DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
-                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            LazyIntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
                 CSharpCode - 
@@ -63,7 +63,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(120, 2, true);
                 HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 5824be1288d..bd3781c03dc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -23,29 +23,29 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(81, 2, true);
                 HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(381, 75, true);
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
-                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
-                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
-                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
-                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
-                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    LazyIntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    LazyIntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    LazyIntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    LazyIntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    LazyIntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    LazyIntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    LazyIntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    LazyIntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -60,7 +60,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(487, 6, true);
                 HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -70,23 +70,23 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(517, 48, true);
                         HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
-                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
-                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                            LazyIntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            LazyIntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            LazyIntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(566, 4, false);
                         CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                            LazyIntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(570, 18, true);
                         HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
-                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            LazyIntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
@@ -96,17 +96,17 @@
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - BeginContext(611, 101, true);
                                 HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
-                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
-                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
-                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
-                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
-                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
-                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
-                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    LazyIntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    LazyIntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    LazyIntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
+                                    LazyIntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    LazyIntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    LazyIntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    LazyIntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    LazyIntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
@@ -117,7 +117,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(718, 6, true);
                         HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                            LazyIntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
@@ -128,7 +128,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(730, 6, true);
                 HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -138,7 +138,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(760, 10, true);
                         HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
@@ -148,14 +148,14 @@
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - BeginContext(809, 83, true);
                                 HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
-                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
-                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
-                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
-                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
-                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
-                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    LazyIntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    LazyIntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    LazyIntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    LazyIntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    LazyIntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    LazyIntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
@@ -166,7 +166,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(898, 6, true);
                         HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                            LazyIntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
@@ -177,13 +177,13 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(910, 11, true);
                 HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
-                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    LazyIntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
-                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+                LazyIntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index 724d88d0a69..59eb0ecd802 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -23,30 +23,30 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPages.cshtml)
-                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(98, 2, true);
                 HtmlContent - (98:5,0 [2] RazorPages.cshtml)
-                    IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(475, 76, true);
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
-                    IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
-                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
-                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
-                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
-                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
-                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
-                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
-                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
-                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    LazyIntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
+                    LazyIntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    LazyIntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    LazyIntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    LazyIntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    LazyIntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    LazyIntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    LazyIntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
+                    LazyIntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -61,7 +61,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(582, 6, true);
                 HtmlContent - (582:26,35 [6] RazorPages.cshtml)
-                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -71,23 +71,23 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(612, 48, true);
                         HtmlContent - (612:27,28 [48] RazorPages.cshtml)
-                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
-                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
-                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
-                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                            LazyIntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            LazyIntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            LazyIntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(661, 10, false);
                         CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
-                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                            LazyIntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(671, 18, true);
                         HtmlContent - (671:28,57 [18] RazorPages.cshtml)
-                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
-                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            LazyIntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
@@ -97,17 +97,17 @@
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - BeginContext(712, 101, true);
                                 HtmlContent - (712:29,31 [101] RazorPages.cshtml)
-                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
-                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
-                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
-                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
-                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
-                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
-                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
-                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    LazyIntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    LazyIntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    LazyIntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
+                                    LazyIntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    LazyIntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    LazyIntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    LazyIntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    LazyIntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
@@ -118,7 +118,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(819, 6, true);
                         HtmlContent - (819:32,14 [6] RazorPages.cshtml)
-                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                            LazyIntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
@@ -129,7 +129,7 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(831, 6, true);
                 HtmlContent - (831:33,10 [6] RazorPages.cshtml)
-                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -139,7 +139,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(861, 10, true);
                         HtmlContent - (861:34,28 [10] RazorPages.cshtml)
-                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                         CSharpCode - 
@@ -149,14 +149,14 @@
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - BeginContext(910, 83, true);
                                 HtmlContent - (910:35,47 [83] RazorPages.cshtml)
-                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
-                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
-                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
-                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
-                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
-                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
-                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    LazyIntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    LazyIntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    LazyIntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    LazyIntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    LazyIntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    LazyIntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
                                 CSharpCode - 
                                     IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
@@ -167,7 +167,7 @@
                         CSharpCode - 
                             IntermediateToken -  - CSharp - BeginContext(999, 6, true);
                         HtmlContent - (999:37,14 [6] RazorPages.cshtml)
-                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                            LazyIntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
                         CSharpCode - 
                             IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
@@ -178,13 +178,13 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(1011, 11, true);
                 HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
-                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
-                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    LazyIntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (112:6,12 [360] RazorPages.cshtml)
-                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+                LazyIntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 631386d09b5..d366a5f7893 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -18,38 +18,38 @@
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] Sections.cshtml)
-                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] Sections.cshtml)
-                    IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - (68:4,2 [46] Sections.cshtml)
-                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                    LazyIntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(117, 26, true);
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
-                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
-                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
-                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
-                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
-                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                    LazyIntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    LazyIntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
+                    LazyIntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    LazyIntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    LazyIntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 Section -  - Section1
                     CSharpCode - 
                         IntermediateToken -  - CSharp - BeginContext(162, 43, true);
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
-                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
-                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
-                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
-                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
-                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                        LazyIntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        LazyIntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        LazyIntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
+                        LazyIntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        LazyIntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        LazyIntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
                     CSharpCode - 
                         IntermediateToken -  - CSharp - EndContext();
                     CSharpCode - 
@@ -61,7 +61,7 @@
                             CSharpExpression - 
                                 IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
                                 IntermediateToken -  - CSharp - __model.
-                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                LazyIntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
                                 IntermediateToken -  - CSharp - )
                         DefaultTagHelperExecute - 
                     CSharpCode - 
@@ -69,7 +69,7 @@
                     CSharpCode - 
                         IntermediateToken -  - CSharp - BeginContext(230, 2, true);
                     HtmlContent - (230:12,29 [2] Sections.cshtml)
-                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+                        LazyIntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
                     CSharpCode - 
                         IntermediateToken -  - CSharp - EndContext();
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
index a1ddc987472..770b7ed3709 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -18,11 +18,11 @@
             FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
-                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                    LazyIntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(59, 2, true);
                 HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
-                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - 
@@ -33,7 +33,7 @@
                     DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
                     DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
-                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                            LazyIntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
                     PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
                     DefaultTagHelperExecute - 
                 CSharpCode - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 72c140f81f3..965dfa692c7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -226,7 +226,7 @@ public void BasicComponent_Runtime()
         AssertLinePragmas(compiled.CodeDocument, designTime: false);
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void Sections_Runtime()
     {
         // Arrange
@@ -366,7 +366,7 @@ public void Model_Runtime()
         AssertLinePragmas(compiled.CodeDocument, designTime: false);
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void ModelExpressionTagHelper_Runtime()
     {
         // Arrange
@@ -390,7 +390,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
         AssertLinePragmas(compiled.CodeDocument, designTime: false);
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void RazorPages_Runtime()
     {
         // Arrange
@@ -427,7 +427,7 @@ public void RazorPagesWithRouteTemplate_Runtime()
         AssertLinePragmas(compiled.CodeDocument, designTime: false);
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void RazorPagesWithoutModel_Runtime()
     {
         // Arrange
@@ -479,7 +479,7 @@ public void ViewWithNamespace_Runtime()
         AssertLinePragmas(compiled.CodeDocument, designTime: false);
     }
 
-    [Fact(Skip = "Reenable after CS1701 errors are resolved")]
+    [Fact]
     public void ViewComponentTagHelper_Runtime()
     {
         // Arrange
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index a88e6ceab17..052a68d7b45 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -13,7 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"741fc99adb54ad906c5cdc5391aeffb51a1e767b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+    [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
+    #nullable restore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    #nullable disable
     {
         #line hidden
         #pragma warning disable 0649
@@ -85,16 +89,26 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
             WriteLiteral("\r\n");
         }
         #pragma warning restore 1998
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; } = default!;
+        #nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
index bb79e736957..b7c69de8343 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -9,14 +9,16 @@
         UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         RazorSourceChecksumAttribute - 
+        RazorCompiledItemMetadataAttribute - 
+        CreateNewOnMetadataUpdateAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
@@ -24,22 +26,22 @@
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
                             IntermediateToken -  - CSharp - __model.
-                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            LazyIntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
                 HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
                 TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
                     DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpExpression - 
                             IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
-                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            LazyIntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
                 HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
-                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index 38801c8dd23..30e08bac14f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -20,7 +20,11 @@ namespace AspNetCore
 #line hidden
 #nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8bf3954ad78688478de155359db8af32627ee2b8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+    [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
+    #nullable restore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    #nullable disable
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
@@ -70,8 +74,8 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
 #nullable restore
-#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
-                                         Write(Name);
+#line (25,48)-(25,52) 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+Write(Name);
 
 #line default
 #line hidden
@@ -156,16 +160,26 @@ public class Customer
 #line default
 #line hidden
 #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; } = default!;
+        #nullable disable
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
         public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 322d48f3484..942bcca8f30 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -10,6 +10,8 @@
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         UsingDirective - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
         RazorSourceChecksumAttribute - 
+        RazorCompiledItemMetadataAttribute - 
+        CreateNewOnMetadataUpdateAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
@@ -19,93 +21,93 @@
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
-                    IntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
-                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
-                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
-                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
-                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (383:20,0 [3] RazorPagesWithoutModel.cshtml) - Html - <h1
+                    LazyIntermediateToken - (386:20,3 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    LazyIntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    LazyIntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    LazyIntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    LazyIntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    LazyIntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    LazyIntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    LazyIntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
                 HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                         HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
-                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
-                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                            LazyIntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            LazyIntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            LazyIntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
                         CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                            LazyIntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
                         HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
-                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            LazyIntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                         TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
                                 HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
-                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
-                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
-                                    IntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
-                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
-                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
-                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
-                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    LazyIntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    LazyIntermediateToken - (652:26,39 [1] RazorPagesWithoutModel.cshtml) - Html -  
+                                    LazyIntermediateToken - (653:26,40 [2] RazorPagesWithoutModel.cshtml) - Html - />
+                                    LazyIntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    LazyIntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    LazyIntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    LazyIntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    LazyIntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
                         HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                            LazyIntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
                 HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    LazyIntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                 TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                         HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            LazyIntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                         TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
                                 HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
-                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
-                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
-                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
-                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
-                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
-                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
-                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    LazyIntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    LazyIntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    LazyIntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    LazyIntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    LazyIntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    LazyIntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
                         HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
-                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                            LazyIntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
                 HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
-                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
-                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    LazyIntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    LazyIntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
             CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
-                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+                LazyIntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index ee11df1c647..ff555dab7b3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -20,7 +20,11 @@ namespace AspNetCore
 #line hidden
 #nullable disable
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d33caff161b646a61b273d7c544111395b652557", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+    [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
+    #nullable restore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    #nullable disable
     {
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
@@ -70,8 +74,8 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
 #nullable restore
-#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
-                                         Write(Model.Name);
+#line (29,48)-(29,58) 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+Write(Model.Name);
 
 #line default
 #line hidden
@@ -159,16 +163,26 @@ public class Customer
 #line default
 #line hidden
 #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; } = default!;
+        #nullable disable
         public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
         public NewModel Model => ViewData.Model;
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index 637439fab3e..1224fd3bd6a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -10,6 +10,8 @@
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         UsingDirective - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
         RazorSourceChecksumAttribute - 
+        RazorCompiledItemMetadataAttribute - 
+        CreateNewOnMetadataUpdateAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
@@ -19,94 +21,94 @@
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (7:1,0 [2] RazorPages.cshtml)
-                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
                 HtmlContent - (98:5,0 [2] RazorPages.cshtml)
-                    IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
-                    IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
-                    IntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
-                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
-                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
-                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
-                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
-                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
-                    IntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
-                    IntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
-                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (477:24,0 [3] RazorPages.cshtml) - Html - <h1
+                    LazyIntermediateToken - (480:24,3 [1] RazorPages.cshtml) - Html - >
+                    LazyIntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    LazyIntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    LazyIntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    LazyIntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    LazyIntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    LazyIntermediateToken - (543:25,43 [1] RazorPages.cshtml) - Html -  
+                    LazyIntermediateToken - (544:25,44 [1] RazorPages.cshtml) - Html - >
+                    LazyIntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
                 HtmlContent - (582:26,35 [6] RazorPages.cshtml)
-                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                         HtmlContent - (612:27,28 [48] RazorPages.cshtml)
-                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
-                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
-                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
-                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                            LazyIntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            LazyIntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            LazyIntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
                         CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
-                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                            LazyIntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
                         HtmlContent - (671:28,57 [18] RazorPages.cshtml)
-                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
-                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            LazyIntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
                         TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
                                 HtmlContent - (712:29,31 [101] RazorPages.cshtml)
-                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
-                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
-                                    IntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
-                                    IntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
-                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
-                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
-                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
-                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
-                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    LazyIntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    LazyIntermediateToken - (753:30,39 [1] RazorPages.cshtml) - Html -  
+                                    LazyIntermediateToken - (754:30,40 [2] RazorPages.cshtml) - Html - />
+                                    LazyIntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    LazyIntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    LazyIntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    LazyIntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    LazyIntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
                         HtmlContent - (819:32,14 [6] RazorPages.cshtml)
-                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                            LazyIntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
                 HtmlContent - (831:33,10 [6] RazorPages.cshtml)
-                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                    LazyIntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
                 TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                         HtmlContent - (861:34,28 [10] RazorPages.cshtml)
-                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                            LazyIntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
                         TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
                                 HtmlContent - (910:35,47 [83] RazorPages.cshtml)
-                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
-                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
-                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
-                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
-                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
-                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
-                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
-                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                                    LazyIntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    LazyIntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    LazyIntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    LazyIntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    LazyIntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    LazyIntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    LazyIntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    LazyIntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
                         HtmlContent - (999:37,14 [6] RazorPages.cshtml)
-                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                            LazyIntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
                 HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
-                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
-                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
-                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    LazyIntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    LazyIntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
             CSharpCode - (112:6,12 [360] RazorPages.cshtml)
-                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+                LazyIntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 1066fffd003..1a4e49077d4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -13,7 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4b7b87da15db4343c99430c0813fd6bc03643453", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
+    #nullable restore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    #nullable disable
     {
         #line hidden
         #pragma warning disable 0649
@@ -77,16 +81,26 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections :
             );
         }
         #pragma warning restore 1998
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; } = default!;
+        #nullable disable
     }
 }
 #pragma warning restore 1591
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 4aaa066fac6..02e57f422f9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -9,31 +9,33 @@
         UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         RazorSourceChecksumAttribute - 
+        RazorCompiledItemMetadataAttribute - 
+        CreateNewOnMetadataUpdateAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (17:1,0 [2] Sections.cshtml)
-                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
                 HtmlContent - (64:3,0 [2] Sections.cshtml)
-                    IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
                 CSharpCode - (68:4,2 [46] Sections.cshtml)
-                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                    LazyIntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
-                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
-                    IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
-                    IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
-                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
-                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
-                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                    LazyIntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    LazyIntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
+                    LazyIntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
+                    LazyIntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    LazyIntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    LazyIntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
                 Section -  - Section1
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
-                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
-                        IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
-                        IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
-                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
-                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
-                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                        LazyIntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        LazyIntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
+                        LazyIntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
+                        LazyIntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        LazyIntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        LazyIntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
                     TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
                         DefaultTagHelperBody - 
                         DefaultTagHelperCreate -  - InputTestTagHelper
@@ -41,11 +43,11 @@
                             CSharpExpression - 
                                 IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
                                 IntermediateToken -  - CSharp - __model.
-                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                LazyIntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
                                 IntermediateToken -  - CSharp - )
                         DefaultTagHelperExecute - 
                     HtmlContent - (230:12,29 [2] Sections.cshtml)
-                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+                        LazyIntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index 9bd52320698..5e4d744ac77 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -13,7 +13,11 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"bf860c3a5e96240c9d41a0b950e49c1a165ca44d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+    [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
+    #nullable restore
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    #nullable disable
     {
         private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
@@ -59,8 +63,8 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewCompon
             __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
             BeginWriteTagHelperAttribute();
 #nullable restore
-#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
-         WriteLiteral(foo);
+#line (6,23)-(6,26) 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+WriteLiteral(foo);
 
 #line default
 #line hidden
@@ -79,16 +83,26 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewCompon
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
         }
         #pragma warning restore 1998
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } = default!;
+        #nullable disable
+        #nullable restore
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
-        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; } = default!;
+        #nullable disable
         [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
         public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
         {
@@ -103,10 +117,19 @@ public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.
             public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
             {
                 (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-                var __helperContent = await __helper.InvokeAsync("Test", new { firstName });
+                var __helperContent = await __helper.InvokeAsync("Test", ProcessInvokeAsyncArgs(__context));
                 __output.TagName = null;
                 __output.Content.SetHtmlContent(__helperContent);
             }
+            private Dictionary<string, object> ProcessInvokeAsyncArgs(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context)
+            {
+                Dictionary<string, object> args = new Dictionary<string, object>();
+                if (__context.AllAttributes.ContainsName("first-name"))
+                {
+                    args[nameof(firstName)] = firstName;
+                }
+                return args;
+            }
         }
     }
 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
index 46a2a38006a..724cbbbedd9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -9,6 +9,8 @@
         UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         RazorSourceChecksumAttribute - 
+        RazorCompiledItemMetadataAttribute - 
+        CreateNewOnMetadataUpdateAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
             PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bar -  World - HtmlAttributeValueStyle.DoubleQuotes
@@ -16,16 +18,16 @@
             FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
-                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                    LazyIntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
                 HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
-                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                    LazyIntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
                 TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - AllTagHelper
                     DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
                     DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
-                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                            LazyIntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
                     PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
                     DefaultTagHelperExecute - 
             Inject -