diff --git a/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs b/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
index 20df0d00d8..e9300f13bf 100644
--- a/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
+++ b/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.DataProtection.SystemWeb
             // Configure the default implementation, passing in our custom discriminator
             var services = new ServiceCollection();
             services.AddDataProtection();
-            services.AddInstance<IApplicationDiscriminator>(new SystemWebApplicationDiscriminator());
+            services.AddSingleton<IApplicationDiscriminator>(new SystemWebApplicationDiscriminator());
 
             // Run user-specified configuration and get an instance of the provider
             ConfigureServices(services);
diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs
index 5c53a1fdd1..4c4a8ae129 100644
--- a/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs
+++ b/src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs
@@ -79,7 +79,7 @@ namespace Microsoft.AspNet.DataProtection
                 throw new ArgumentNullException(nameof(sink));
             }
 
-            Services.AddInstance<IKeyEscrowSink>(sink);
+            Services.AddSingleton<IKeyEscrowSink>(sink);
             return this;
         }
 
diff --git a/test/Microsoft.AspNet.DataProtection.Test/ActivatorTests.cs b/test/Microsoft.AspNet.DataProtection.Test/ActivatorTests.cs
index 5535eba438..5bea3ae5b6 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/ActivatorTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/ActivatorTests.cs
@@ -72,7 +72,7 @@ namespace Microsoft.AspNet.DataProtection
             // Arrange
             var expectedActivator = new Mock<IActivator>().Object;
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IActivator>(expectedActivator);
+            serviceCollection.AddSingleton<IActivator>(expectedActivator);
 
             // Act
             var actualActivator = serviceCollection.BuildServiceProvider().GetActivator();
diff --git a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
index 3a0148b33e..989b7aafd5 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
@@ -43,7 +43,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
                 });
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink.Object);
+            serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink.Object);
             var services = serviceCollection.BuildServiceProvider();
 
             // Act
@@ -75,8 +75,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
                 });
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink1.Object);
-            serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink2.Object);
+            serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink1.Object);
+            serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink2.Object);
             var services = serviceCollection.BuildServiceProvider();
 
             // Act
diff --git a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs
index 3cba1f3f58..f136127af4 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs
@@ -588,7 +588,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
         private static KeyRingProvider CreateKeyRingProvider(ICacheableKeyRingProvider cacheableKeyRingProvider)
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<ICacheableKeyRingProvider>(cacheableKeyRingProvider);
+            serviceCollection.AddSingleton<ICacheableKeyRingProvider>(cacheableKeyRingProvider);
             return new KeyRingProvider(
                 keyManager: null,
                 keyManagementOptions: null,
@@ -598,7 +598,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
         private static ICacheableKeyRingProvider CreateKeyRingProvider(IKeyManager keyManager, IDefaultKeyResolver defaultKeyResolver, KeyManagementOptions keyManagementOptions= null)
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IDefaultKeyResolver>(defaultKeyResolver);
+            serviceCollection.AddSingleton<IDefaultKeyResolver>(defaultKeyResolver);
             return new KeyRingProvider(
                 keyManager: keyManager,
                 keyManagementOptions: keyManagementOptions,
diff --git a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs
index 19c8c75460..a0c8e319ee 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs
@@ -37,8 +37,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
             mockFallback.Setup(o => o.GetKeyRepository()).Returns(expectedRepository);
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IDefaultKeyServices>(mockFallback.Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IDefaultKeyServices>(mockFallback.Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
             var services = serviceCollection.BuildServiceProvider();
 
             // Act
@@ -58,9 +58,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
             mockFallback.Setup(o => o.GetKeyRepository()).Returns(new Mock<IXmlRepository>().Object);
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IDefaultKeyServices>(mockFallback.Object);
-            serviceCollection.AddInstance<IXmlEncryptor>(new Mock<IXmlEncryptor>().Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IDefaultKeyServices>(mockFallback.Object);
+            serviceCollection.AddSingleton<IXmlEncryptor>(new Mock<IXmlEncryptor>().Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
             var services = serviceCollection.BuildServiceProvider();
 
             // Act & assert - we don't care about exception type, only exception message
@@ -97,8 +97,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
+            serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
 
@@ -188,9 +188,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
-            serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrow.Object);
+            serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
+            serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrow.Object);
             serviceCollection.AddSingleton<IXmlEncryptor, NullXmlEncryptor>();
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
@@ -288,9 +288,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(new Mock<IXmlRepository>().Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
-            serviceCollection.AddInstance<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
+            serviceCollection.AddSingleton<IXmlRepository>(new Mock<IXmlRepository>().Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
 
@@ -584,12 +584,12 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object);
-            serviceCollection.AddInstance<IActivator>(activator);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
+            serviceCollection.AddSingleton<IActivator>(activator);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
             if (loggerFactory != null)
             {
-                serviceCollection.AddInstance<ILoggerFactory>(loggerFactory);
+                serviceCollection.AddSingleton<ILoggerFactory>(loggerFactory);
             }
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
@@ -615,8 +615,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
 
@@ -664,8 +664,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
 
@@ -716,9 +716,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
             // Arrange - services
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IXmlRepository>(new Mock<IXmlRepository>().Object);
-            serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
-            serviceCollection.AddInstance<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
+            serviceCollection.AddSingleton<IXmlRepository>(new Mock<IXmlRepository>().Object);
+            serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
+            serviceCollection.AddSingleton<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
             var services = serviceCollection.BuildServiceProvider();
             var keyManager = new XmlKeyManager(services);
 
diff --git a/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs b/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs
index 9e5a2d45a0..bfaf877e89 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
                     encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption
                     return encryptedXml.Encrypt(element, "theKey");
                 });
-            serviceCollection.AddInstance<IInternalCertificateXmlEncryptor>(mockInternalEncryptor.Object);
+            serviceCollection.AddSingleton<IInternalCertificateXmlEncryptor>(mockInternalEncryptor.Object);
 
             var mockInternalDecryptor = new Mock<IInternalEncryptedXmlDecryptor>();
             mockInternalDecryptor.Setup(o => o.PerformPreDecryptionSetup(It.IsAny<EncryptedXml>()))
@@ -37,7 +37,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
                 {
                     encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption
                 });
-            serviceCollection.AddInstance<IInternalEncryptedXmlDecryptor>(mockInternalDecryptor.Object);
+            serviceCollection.AddSingleton<IInternalEncryptedXmlDecryptor>(mockInternalDecryptor.Object);
 
             var services = serviceCollection.BuildServiceProvider();
             var encryptor = new CertificateXmlEncryptor(services);
diff --git a/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/XmlEncryptionExtensionsTests.cs b/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/XmlEncryptionExtensionsTests.cs
index be0b05dfd9..f6b03eaac6 100644
--- a/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/XmlEncryptionExtensionsTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/XmlEncryptionExtensionsTests.cs
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
             mockActivator.ReturnDecryptedElementGivenDecryptorTypeNameAndInput("theDecryptor", "<node />", "<newNode />");
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IActivator>(mockActivator.Object);
+            serviceCollection.AddSingleton<IActivator>(mockActivator.Object);
             var services = serviceCollection.BuildServiceProvider();
             var activator = services.GetActivator();
 
@@ -89,7 +89,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
             mockActivator.Setup(o => o.CreateInstance(typeof(IXmlDecryptor), "myDecryptor")).Returns(mockDecryptor.Object);
 
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IActivator>(mockActivator.Object);
+            serviceCollection.AddSingleton<IActivator>(mockActivator.Object);
             var services = serviceCollection.BuildServiceProvider();
             var activator = services.GetActivator();