diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs
index 7e97670db1..fa3069d427 100644
--- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs
+++ b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNet.PipelineCore
     public class DefaultCanHasQuery : ICanHasQuery
     {
         private readonly IFeatureCollection _features;
-        private FeatureReference<IHttpRequestInformation> _request = new FeatureReference<IHttpRequestInformation>();
+        private FeatureReference<IHttpRequestInformation> _request = FeatureReference<IHttpRequestInformation>.Default;
         private string _queryString;
         private IReadableStringCollection _query;
 
diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs
index f4d23e029e..df33085763 100644
--- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs
+++ b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.PipelineCore
     public class DefaultCanHasRequestCookies : ICanHasRequestCookies
     {
         private readonly IFeatureCollection _features;
-        private FeatureReference<IHttpRequestInformation> _request = new FeatureReference<IHttpRequestInformation>();
+        private FeatureReference<IHttpRequestInformation> _request = FeatureReference<IHttpRequestInformation>.Default;
         private string _cookiesHeader;
         private RequestCookiesCollection _cookiesCollection;
         private static readonly string[] ZeroHeaders = new string[0];
diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs
index 4dc7adf253..778611eee0 100644
--- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs
+++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.PipelineCore
             _request = new DefaultHttpRequest(this, features);
             _response = new DefaultHttpResponse(this, features);
 
-            _canHasItems = new FeatureReference<ICanHasItems>();
+            _canHasItems = FeatureReference<ICanHasItems>.Default;
         }
 
         ICanHasItems CanHasItems
diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
index 055af55c49..2e96c4eca7 100644
--- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
+++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
@@ -12,11 +12,11 @@ namespace Microsoft.AspNet.PipelineCore
         private readonly DefaultHttpContext _context;
         private readonly IFeatureCollection _features;
 
-        private FeatureReference<IHttpRequestInformation> _request = new FeatureReference<IHttpRequestInformation>();
-        private FeatureReference<IHttpConnection> _connection = new FeatureReference<IHttpConnection>();
-        private FeatureReference<IHttpTransportLayerSecurity> _transportLayerSecurity = new FeatureReference<IHttpTransportLayerSecurity>();
-        private FeatureReference<ICanHasQuery> _canHasQuery = new FeatureReference<ICanHasQuery>();
-        private FeatureReference<ICanHasRequestCookies> _canHasCookies = new FeatureReference<ICanHasRequestCookies>();
+        private FeatureReference<IHttpRequestInformation> _request = FeatureReference<IHttpRequestInformation>.Default;
+        private FeatureReference<IHttpConnection> _connection = FeatureReference<IHttpConnection>.Default;
+        private FeatureReference<IHttpTransportLayerSecurity> _transportLayerSecurity = FeatureReference<IHttpTransportLayerSecurity>.Default;
+        private FeatureReference<ICanHasQuery> _canHasQuery = FeatureReference<ICanHasQuery>.Default;
+        private FeatureReference<ICanHasRequestCookies> _canHasCookies = FeatureReference<ICanHasRequestCookies>.Default;
 
         public DefaultHttpRequest(DefaultHttpContext context, IFeatureCollection features)
         {
diff --git a/src/Microsoft.AspNet.PipelineCore/Infrastructure/FeatureReference.cs b/src/Microsoft.AspNet.PipelineCore/Infrastructure/FeatureReference.cs
index 70aba473a5..ed76942784 100644
--- a/src/Microsoft.AspNet.PipelineCore/Infrastructure/FeatureReference.cs
+++ b/src/Microsoft.AspNet.PipelineCore/Infrastructure/FeatureReference.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.PipelineCore.Infrastructure
         }
 
         public static readonly FeatureReference<T> Default = new FeatureReference<T>(default(T), -1);
- 
+
         public T Fetch(IFeatureCollection features)
         {
             if (_revision == features.Revision) return _feature;
diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/project.json b/test/Microsoft.AspNet.PipelineCore.Tests/project.json
index 0a90b7ac74..e4bb833e89 100644
--- a/test/Microsoft.AspNet.PipelineCore.Tests/project.json
+++ b/test/Microsoft.AspNet.PipelineCore.Tests/project.json
@@ -4,7 +4,8 @@
     "Microsoft.AspNet.AppBuilderSupport": "",
     "Microsoft.AspNet.HttpFeature": "",
     "Microsoft.AspNet.Abstractions": "",
-    "Microsoft.AspNet.FeatureModel": ""
+    "Microsoft.AspNet.FeatureModel": "",
+    "Microsoft.AspNet.PipelineCore": ""
   },
   "configurations": {
     "net45": { 
@@ -13,7 +14,7 @@
       "Microsoft.Owin": "2.1.0",
       "Microsoft.Owin.Hosting": "2.1.0",
       "Microsoft.Owin.Testing": "2.1.0",
-	  "Moq": "4.2.1312.1622",
+      "Moq": "4.2.1312.1622",
       "xunit": "1.9.2",
       "Microsoft.Net.Http": "2.2.13",
       "System.Net.Http": ""