diff --git a/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs b/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs
index ec3a230146..e2af1cc4f6 100644
--- a/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs
+++ b/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs
@@ -28,17 +28,17 @@ namespace Microsoft.AspNet.Buffering
                 return;
             }
 
-            var originalBufferingFeature = httpContext.GetFeature<IHttpBufferingFeature>();
-            var originalSendFileFeature = httpContext.GetFeature<IHttpSendFileFeature>();
+            var originalBufferingFeature = httpContext.Features.Get<IHttpBufferingFeature>();
+            var originalSendFileFeature = httpContext.Features.Get<IHttpSendFileFeature>();
             try
             {
                 // Shim the response stream
                 var bufferStream = new BufferingWriteStream(originalResponseBody);
                 httpContext.Response.Body = bufferStream;
-                httpContext.SetFeature<IHttpBufferingFeature>(new HttpBufferingFeature(bufferStream, originalBufferingFeature));
+                httpContext.Features.Set<IHttpBufferingFeature>(new HttpBufferingFeature(bufferStream, originalBufferingFeature));
                 if (originalSendFileFeature != null)
                 {
-                    httpContext.SetFeature<IHttpSendFileFeature>(new SendFileFeatureWrapper(originalSendFileFeature, bufferStream));
+                    httpContext.Features.Set<IHttpSendFileFeature>(new SendFileFeatureWrapper(originalSendFileFeature, bufferStream));
                 }
 
                 await _next(httpContext);
@@ -57,8 +57,8 @@ namespace Microsoft.AspNet.Buffering
             finally
             {
                 // undo everything
-                httpContext.SetFeature(originalBufferingFeature);
-                httpContext.SetFeature(originalSendFileFeature);
+                httpContext.Features.Set(originalBufferingFeature);
+                httpContext.Features.Set(originalSendFileFeature);
                 httpContext.Response.Body = originalResponseBody;
             }
         }
diff --git a/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs b/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
index ee7431ec28..5569a14222 100644
--- a/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
@@ -207,7 +207,7 @@ namespace Microsoft.AspNet.Buffering.Tests
                     Assert.False(context.Response.HasStarted);
                     Assert.True(context.Response.Body.CanSeek);
 
-                    var bufferingFeature = context.GetFeature<IHttpBufferingFeature>();
+                    var bufferingFeature = context.Features.Get<IHttpBufferingFeature>();
                     Assert.NotNull(bufferingFeature);
                     bufferingFeature.DisableResponseBuffering();
 
@@ -244,7 +244,7 @@ namespace Microsoft.AspNet.Buffering.Tests
                     Assert.False(context.Response.HasStarted);
                     Assert.True(context.Response.Body.CanSeek);
 
-                    var bufferingFeature = context.GetFeature<IHttpBufferingFeature>();
+                    var bufferingFeature = context.Features.Get<IHttpBufferingFeature>();
                     Assert.NotNull(bufferingFeature);
                     bufferingFeature.DisableResponseBuffering();