diff --git a/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs b/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
index 836eccc832..fa1d2eadcf 100644
--- a/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
@@ -50,5 +50,10 @@ namespace Microsoft.AspNet.Razor.Generator
         /// <see cref="TargetWriterName"/>, i.e. WriteLiteralTo(myWriter, "Hello World").
         /// </remarks>
         public string TargetWriterName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by <see cref="SourceFile"/>.
+        /// </summary>
+        public string Checksum { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Razor/Generator/CodeGeneratorContext.cs b/src/Microsoft.AspNet.Razor/Generator/CodeGeneratorContext.cs
index 72ef73d7bd..4a68b4ccac 100644
--- a/src/Microsoft.AspNet.Razor/Generator/CodeGeneratorContext.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/CodeGeneratorContext.cs
@@ -40,10 +40,5 @@ namespace Microsoft.AspNet.Razor.Generator
         public RazorEngineHost Host { get; private set; }
 
         public CodeTreeBuilder CodeTreeBuilder { get; set; }
-        /// <summary>
-        /// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by <see cref="SourceFile"/>.
-        /// </summary>
-        public string Checksum { get; set; }
-
     }
 }
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
index 9e44c2deb1..c2f7b9a2ce 100644
--- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
+++ b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
@@ -150,6 +150,10 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
                 {
                     name = symbol.Content;
                 }
+                else if (afterEquals)
+                {
+                    builder.Accept(symbol);
+                }
                 else if (symbol.Type == HtmlSymbolType.Equals)
                 {
                     // We've found an '=' symbol, this means that the coming symbols will either be a quote
@@ -174,10 +178,6 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
 
                     afterEquals = true;
                 }
-                else if (afterEquals)
-                {
-                    builder.Accept(symbol);
-                }
             }
 
             return new KeyValuePair<string, SyntaxTreeNode>(name, builder.Build());
diff --git a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
index 8b7aab1e04..20e1654e88 100644
--- a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
+++ b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
@@ -253,10 +253,8 @@ namespace Microsoft.AspNet.Razor
             generator.Visit(results);
 
             var codeBuilderContext = new CodeBuilderContext(generator.Context);
+            codeBuilderContext.Checksum = checksum;
             var builder = CreateCodeBuilder(codeBuilderContext);
-            codeGenerationContext.Checksum = checksum;
-
-            var builder = CreateCodeBuilder(codeGenerationContext);
             var builderResult = builder.Build();
 
             // Collect results and return