diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Internal/GeneratedViewComponentTagHelperContext.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Internal/GeneratedViewComponentTagHelperContext.cs
index b72d7399c0..4102811a29 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Internal/GeneratedViewComponentTagHelperContext.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Internal/GeneratedViewComponentTagHelperContext.cs
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host.Internal
         public string ViewContextTypeName { get; set; }
 
         /// <summary>
-        /// Name of the ViewContextAttribute type for view execution.
+        /// Name of the ViewContextAttribute type.
         /// </summary>
         public string ViewContextAttributeTypeName { get; set; }
     }
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
index 9ed52055fe..2d171b4cf6 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
@@ -165,10 +165,8 @@ namespace Microsoft.Extensions.DependencyInjection
 
             services.TryAddSingleton<ITagHelperTypeResolver, TagHelperTypeResolver>();
             services.TryAddSingleton<ITagHelperDescriptorFactory>(s => new TagHelperDescriptorFactory(designTime: false));
-            services.TryAddSingleton<TagHelperDescriptorResolver, TagHelperDescriptorResolver>();
-
-            // And ViewComponentTagHelper resolver.
-            services.TryAddSingleton<ViewComponentTagHelperDescriptorResolver, ViewComponentTagHelperDescriptorResolver>();
+            services.TryAddSingleton<TagHelperDescriptorResolver>();
+            services.TryAddSingleton<ViewComponentTagHelperDescriptorResolver>();
             services.TryAddSingleton<ITagHelperDescriptorResolver, CompositeTagHelperDescriptorResolver>();
 
             // Caches compilation artifacts across the lifetime of the application.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompositeTagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompositeTagHelperDescriptorResolver.cs
index c276dc32c7..fc4219a906 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompositeTagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompositeTagHelperDescriptorResolver.cs
@@ -9,26 +9,23 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class CompositeTagHelperDescriptorResolver : ITagHelperDescriptorResolver
     {
-        public IList<TagHelperDescriptorResolver> _resolvers;
+        private readonly TagHelperDescriptorResolver _tagHelperDescriptorResolver;
+        private readonly ViewComponentTagHelperDescriptorResolver _viewComponentTagHelperDescriptorResolver;
 
         public CompositeTagHelperDescriptorResolver(
             TagHelperDescriptorResolver tagHelperDescriptorResolver,
             ViewComponentTagHelperDescriptorResolver viewComponentTagHelperDescriptorResolver)
         {
-            _resolvers = new List<TagHelperDescriptorResolver>();
-            _resolvers.Add(tagHelperDescriptorResolver);
-            _resolvers.Add(viewComponentTagHelperDescriptorResolver);
+            _tagHelperDescriptorResolver = tagHelperDescriptorResolver;
+            _viewComponentTagHelperDescriptorResolver = viewComponentTagHelperDescriptorResolver;
         }
 
         public IEnumerable<TagHelperDescriptor> Resolve(TagHelperDescriptorResolutionContext resolutionContext)
         {
             var descriptors = new List<TagHelperDescriptor>();
 
-            foreach (var resolver in _resolvers)
-            {
-                var currentDescriptors = resolver.Resolve(resolutionContext);
-                descriptors.AddRange(currentDescriptors);
-            }
+            descriptors.AddRange(_tagHelperDescriptorResolver.Resolve(resolutionContext));
+            descriptors.AddRange(_viewComponentTagHelperDescriptorResolver.Resolve(resolutionContext));
 
             return descriptors;
         }
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewComponentTagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewComponentTagHelperDescriptorResolver.cs
index 090d58f5bb..49ec9f3d5f 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewComponentTagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewComponentTagHelperDescriptorResolver.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class ViewComponentTagHelperDescriptorResolver : TagHelperDescriptorResolver
     {
-        ViewComponentTagHelperDescriptorFactory _descriptorFactory;
+        private readonly ViewComponentTagHelperDescriptorFactory _descriptorFactory;
 
         public ViewComponentTagHelperDescriptorResolver(
             IViewComponentDescriptorProvider viewComponentDescriptorProvider)