From 02b8fb3bbc241fc9e0dc9c39c1f6badb7e2c584c Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Wed, 7 Sep 2016 11:33:05 -0700
Subject: [PATCH] Use TaskCache class from
 Microsoft.Extensions.TaskCache.Sources

---
 .../ResponseCachingMiddleware.cs                            | 3 ++-
 src/Microsoft.AspNetCore.ResponseCaching/project.json       | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs b/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs
index 96c1a713a3..240c44b4d5 100644
--- a/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs
+++ b/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 
@@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.ResponseCaching
         private static readonly Func<object, Task> OnStartingCallback = state =>
         {
             ((ResponseCachingContext)state).OnResponseStarting();
-            return Task.FromResult(0);
+            return TaskCache.CompletedTask;
         };
 
         private readonly RequestDelegate _next;
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/project.json b/src/Microsoft.AspNetCore.ResponseCaching/project.json
index ae02d9e641..70fa887b15 100644
--- a/src/Microsoft.AspNetCore.ResponseCaching/project.json
+++ b/src/Microsoft.AspNetCore.ResponseCaching/project.json
@@ -23,7 +23,11 @@
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Http.Extensions": "1.1.0-*",
-    "Microsoft.Extensions.Caching.Memory": "1.1.0-*"
+    "Microsoft.Extensions.Caching.Memory": "1.1.0-*",
+    "Microsoft.Extensions.TaskCache.Sources": {
+      "version": "1.1.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
     "net451": {},