diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
index 9de26d9271..f3f4dbe8fe 100644
--- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
+++ b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Buffering
 {
@@ -133,7 +134,7 @@ namespace Microsoft.AspNetCore.Buffering
             {
                 return FlushAsync(cancellationToken);
             }
-            return Task.FromResult(0);
+            return TaskCache.CompletedTask;
         }
 
         public override void Write(byte[] buffer, int offset, int count)
diff --git a/src/Microsoft.AspNetCore.Buffering/project.json b/src/Microsoft.AspNetCore.Buffering/project.json
index c202a5178b..fa9d8bf0ad 100644
--- a/src/Microsoft.AspNetCore.Buffering/project.json
+++ b/src/Microsoft.AspNetCore.Buffering/project.json
@@ -21,7 +21,11 @@
     ]
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Http.Abstractions": "1.1.0-*"
+    "Microsoft.AspNetCore.Http.Abstractions": "1.1.0-*",
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
     "net451": {},
diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs b/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
index 032b2250ee..7838ecbc0a 100644
--- a/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite.Logging;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
@@ -17,8 +18,6 @@ namespace Microsoft.AspNetCore.Rewrite
     /// </summary>
     public class RewriteMiddleware
     {
-        private static readonly Task CompletedTask = Task.FromResult(0);
-
         private readonly RequestDelegate _next;
         private readonly RewriteOptions _options;
         private readonly IFileProvider _fileProvider;
@@ -85,7 +84,7 @@ namespace Microsoft.AspNetCore.Rewrite
                         _logger.RewriteMiddlewareRequestResponseComplete(
                             context.Response.Headers[HeaderNames.Location],
                             context.Response.StatusCode);
-                        return CompletedTask;
+                        return TaskCache.CompletedTask;
                     case RuleTermination.StopRules:
                         _logger.RewriteMiddlewareRequestStopRules();
                         return _next(context);
diff --git a/src/Microsoft.AspNetCore.Rewrite/project.json b/src/Microsoft.AspNetCore.Rewrite/project.json
index 866c21b8a2..b88732b107 100644
--- a/src/Microsoft.AspNetCore.Rewrite/project.json
+++ b/src/Microsoft.AspNetCore.Rewrite/project.json
@@ -26,7 +26,11 @@
     "Microsoft.Extensions.Configuration.Abstractions": "1.1.0-*",
     "Microsoft.Extensions.FileProviders.Abstractions": "1.1.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*",
-    "Microsoft.Extensions.Options": "1.1.0-*"
+    "Microsoft.Extensions.Options": "1.1.0-*",
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
     "net451": {