diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs
index 0276fb626c..9bccf26976 100644
--- a/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs
+++ b/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Http
 {
@@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.Http
         private static readonly Func<object, Task> _disposeDelegate = disposable =>
         {
             ((IDisposable)disposable).Dispose();
-            return Task.FromResult(0);
+            return TaskCache.CompletedTask;
         };
 
         /// <summary>
diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/project.json b/src/Microsoft.AspNetCore.Http.Abstractions/project.json
index 1353449366..f67a51ea1d 100644
--- a/src/Microsoft.AspNetCore.Http.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Http.Abstractions/project.json
@@ -24,6 +24,10 @@
       "type": "build",
       "version": "1.1.0-*"
     },
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    },
     "System.Text.Encodings.Web": "4.0.0-*"
   },
   "frameworks": {
diff --git a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs b/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
index a0315ee539..6b36842fbb 100644
--- a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
+++ b/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Builder.Internal
 {
@@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Builder.Internal
             RequestDelegate app = context =>
             {
                 context.Response.StatusCode = 404;
-                return Task.FromResult(0);
+                return TaskCache.CompletedTask;
             };
 
             foreach (var component in _components.Reverse())
diff --git a/src/Microsoft.AspNetCore.Http/project.json b/src/Microsoft.AspNetCore.Http/project.json
index 079d9b853e..792c59899d 100644
--- a/src/Microsoft.AspNetCore.Http/project.json
+++ b/src/Microsoft.AspNetCore.Http/project.json
@@ -24,6 +24,10 @@
     "Microsoft.AspNetCore.WebUtilities": "1.1.0-*",
     "Microsoft.Extensions.ObjectPool": "1.1.0-*",
     "Microsoft.Extensions.Options": "1.1.0-*",
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    },
     "Microsoft.Net.Http.Headers": "1.1.0-*",
     "System.Buffers": "4.0.0-*"
   },
diff --git a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
index 45bd5884aa..4d30f52cec 100644
--- a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
+++ b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
@@ -17,6 +17,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Authentication;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -67,7 +68,7 @@ namespace Microsoft.AspNetCore.Owin
                         feature.OnStarting(s =>
                         {
                             cb(s);
-                            return Task.FromResult(0);
+                            return TaskCache.CompletedTask;
                         }, state);
                     }))
                 },
diff --git a/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
index be5020c47e..45bb017925 100644
--- a/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
+++ b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
@@ -7,6 +7,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -68,7 +69,7 @@ namespace Microsoft.AspNetCore.Owin
             else if (messageType == 0x9 || messageType == 0xA)
             {
                 // Ping & Pong, not allowed by the underlying APIs, silently discard.
-                return Task.FromResult(0);
+                return TaskCache.CompletedTask;
             }
 
             return _webSocket.SendAsync(buffer, OpCodeToEnum(messageType), endOfMessage, cancel);
diff --git a/src/Microsoft.AspNetCore.Owin/project.json b/src/Microsoft.AspNetCore.Owin/project.json
index 2c22181651..66160588c2 100644
--- a/src/Microsoft.AspNetCore.Owin/project.json
+++ b/src/Microsoft.AspNetCore.Owin/project.json
@@ -21,7 +21,11 @@
     "xmlDoc": true
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Http": "1.1.0-*"
+    "Microsoft.AspNetCore.Http": "1.1.0-*",
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
     "net451": {},