diff --git a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
index 5f2dd8e9e6..6f641e2f1c 100644
--- a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
@@ -10,7 +10,7 @@ using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
-using Microsoft.Extensions.WebEncoders;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.StaticFiles
 {
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.StaticFiles
     {
         private const string TextHtmlUtf8 = "text/html; charset=utf-8";
 
-        private static HtmlEncoder _htmlEncoder;
+        private HtmlEncoder _htmlEncoder;
 
         /// <summary>
         /// Generates an HTML view for a directory.
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.StaticFiles
 
             if (_htmlEncoder == null)
             {
-                _htmlEncoder = context.RequestServices.GetHtmlEncoder();
+                _htmlEncoder = context.RequestServices.GetRequiredService<HtmlEncoder>();
             }
 
             context.Response.ContentType = TextHtmlUtf8;
@@ -160,7 +160,7 @@ namespace Microsoft.AspNet.StaticFiles
             return context.Response.Body.WriteAsync(bytes, 0, bytes.Length);
         }
 
-        private static string HtmlEncode(string body)
+        private string HtmlEncode(string body)
         {
             return _htmlEncoder.Encode(body);
         }