diff --git a/src/SimpleInjector.Tests.Unit/GetRegistrationOfTTests.cs b/src/SimpleInjector.Tests.Unit/GetRegistrationOfTTests.cs
new file mode 100644
index 00000000..b66f73d2
--- /dev/null
+++ b/src/SimpleInjector.Tests.Unit/GetRegistrationOfTTests.cs
@@ -0,0 +1,320 @@
+namespace SimpleInjector.Tests.Unit
+{
+    using System;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class GetRegistrationOfTTests
+    {
+        [TestMethod]
+        public void GetRegistration_RequestingAnExplicitlyRegisteredType_DoesNotLockTheContainer()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ITimeProvider, RealTimeProvider>();
+
+            // Act
+            // An explicitly made registration is returned from the internal root cache
+            var prod = container.GetRegistration<ITimeProvider>();
+
+            Assert.IsNotNull(prod, "Test setup failed");
+
+            // Act
+            Assert.IsFalse(container.IsLocked,
+                "No internal container state has been changed, and the container doesn't have to be locked.");
+        }
+
+        [TestMethod]
+        public void GetRegistration_WhenTheRegistrationIsUnknownAndCanNotBeCreated_LocksTheContainer()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.ResolveUnregisteredType += (s, e) => { };
+
+            // Act
+            var prod = container.GetRegistration<ITimeProvider>();
+
+            Assert.IsNull(prod, "Test setup failed");
+
+            Assert.IsFalse(container.IsLocked, @"
+                GetRegistration should not cause the container to be locked when GetRegistration returns
+                null, even when ResolveUnregisteredType events are registered. The idea is that when the
+                events didn't respond to the unregistered type, they don't noticably change the state of
+                the system that would force the container to be locked.");
+        }
+
+        [TestMethod]
+        public void GetRegistration_WhenTheRegistrationIsUnknownButCanBeCreated_LocksTheContainer()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Act
+            var prod = container.GetRegistration<RealTimeProvider>();
+
+            Assert.IsNotNull(prod, "Test setup failed.");
+
+            // Arrange
+            Assert.IsTrue(container.IsLocked, @"
+                Whenever a not explicitly made registration can be returned, the container needs to be locked,
+                since in most cases, changing the container might invalidate the registration. For instance,
+                building concrete type registrations will create a transient registration, while making the
+                registration later might be done with a different lifestyle.");
+        }
+
+        [TestMethod]
+        public void GetRegistration_WhenTheRegistrationIsUnknownButCanBeCreatedUsingUnregTypeRes_DoesNotLockTheContainer()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Not sure whether it would be wise to always lock the container when an unregistered event handler is fired.
+            container.ResolveUnregisteredType += (s, e) =>
+            {
+                e.Register(Lifestyle.Singleton.CreateRegistration<RealTimeProvider>(container));
+            };
+
+            // Act
+            var prod = container.GetRegistration<ITimeProvider>();
+
+            Assert.IsNotNull(prod, "Test setup failed.");
+
+            // Arrange
+            Assert.IsTrue(container.IsLocked, @"
+            Whenever a not-explicitly made registration can be returned using unregistered type resolution,
+            the container needs to be locked, changing the container might invalidate the registration.
+            For instance, adding unregistered type resolution events later, might cause a different registration to
+            be returned when GetRegistration is called again.");
+        }
+
+        [TestMethod]
+        public void GetRegistration_TransientInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ITimeProvider, RealTimeProvider>();
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_TransientConcreteInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<RealTimeProvider>();
+
+            // Act
+            var provider = container.GetRegistration<RealTimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(RealTimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_FuncTransientInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ITimeProvider>(() => new RealTimeProvider());
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_ImplicitlyRegisteredTransientInstance_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.GetInstance<RealTimeProvider>();
+
+            // Act
+            var provider = container.GetRegistration<RealTimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(RealTimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_SingleInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ITimeProvider, RealTimeProvider>(Lifestyle.Singleton);
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_SingleConcreteInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<RealTimeProvider>(Lifestyle.Singleton);
+
+            // Act
+            var provider = container.GetRegistration<RealTimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(RealTimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_FuncSingleInstanceRegistered_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ITimeProvider>(() => new RealTimeProvider(), Lifestyle.Singleton);
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_SingleInstanceRegisteredByObject_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.RegisterInstance<ITimeProvider>(new RealTimeProvider());
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_InstanceResolvedUsingUnregisteredTypeResolution_ReturnsExpectedRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.ResolveUnregisteredType += (sender, e) =>
+            {
+                e.Register(() => new RealTimeProvider());
+            };
+
+            container.GetInstance<ITimeProvider>();
+
+            // Act
+            var provider = container.GetRegistration<ITimeProvider>();
+
+            // Assert
+            Assert.AreEqual(typeof(ITimeProvider), provider.ServiceType);
+        }
+
+        [TestMethod]
+        public void GetRegistration_OnUnregisteredUnconstructableType_ReturnsNull()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Act
+            var registration = container.GetRegistration<IDisposable>();
+
+            // Assert
+            Assert.IsNull(registration);
+        }
+
+        [TestMethod]
+        public void GetRegistrationDontThrowOnFailure_OnUnregisteredUnconstructableType_ReturnsNull()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Act
+            var registration = container.GetRegistration<IDisposable>(throwOnFailure: false);
+
+            // Assert
+            Assert.IsNull(registration);
+        }
+
+        [TestMethod]
+        public void GetRegistrationDoThrowOnFailure_OnUnregisteredUnconstructableType_Throws()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            try
+            {
+                // Act
+                var registration = container.GetRegistration<IDisposable>(throwOnFailure: true);
+
+                // Assert
+                Assert.Fail("Exception expected.");
+            }
+            catch (ActivationException ex)
+            {
+                AssertThat.StringContains("No registration for type IDisposable could be found.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void GetRegistration_OnOnregisteredString_ReturnsNull()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Act
+            var registration = container.GetRegistration<string>();
+
+            // Assert
+            Assert.IsNull(registration);
+        }
+
+        [TestMethod]
+        public void GetRegistration_OnInvalidUnregisteredType_ReturnsNull()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            // Act
+            var registration = container.GetRegistration<ServiceWithUnregisteredDependencies>();
+
+            // Assert
+            Assert.IsNull(registration, "IInstanceProducer returned.");
+        }
+
+        [TestMethod]
+        public void GetRegistration_OnInvalidButRegisteredType_ReturnsThatRegistration()
+        {
+            // Arrange
+            var container = ContainerFactory.New();
+
+            container.Register<ServiceWithUnregisteredDependencies>();
+
+            // Act
+            var registration = container.GetRegistration<ServiceWithUnregisteredDependencies>();
+
+            // Assert
+            Assert.IsNotNull(registration, "The GetRegistration method is expected to return an " +
+                "InstanceProducer since it is explicitly registered by the user.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SimpleInjector/Container.Resolving.cs b/src/SimpleInjector/Container.Resolving.cs
index 577aa4e0..5d8b3e99 100644
--- a/src/SimpleInjector/Container.Resolving.cs
+++ b/src/SimpleInjector/Container.Resolving.cs
@@ -167,7 +167,7 @@ public IEnumerable<object> GetAllInstances(Type serviceType)
         /// </para>
         /// </remarks>
         /// <returns>An <see cref="InstanceProducer"/> or <b>null</b>.</returns>
-        public InstanceProducer<TService>? GetRegistration<TService>()
+        public InstanceProducer? GetRegistration<TService>()
             where TService : class
         {
             return this.GetRegistration<TService>(throwOnFailure: false);
@@ -188,16 +188,16 @@ public IEnumerable<object> GetAllInstances(Type serviceType)
         /// </para>
         /// <para>
         /// <b>Note:</b> This method is <i>not</i> guaranteed to always return the same
-        /// <see cref="InstanceProducer"/> instance for a given <see cref="System.Type"/>. It will however either
+        /// <see cref="InstanceProducer"/> instance for a given <see cref="Type"/>. It will however either
         /// always return <b>null</b> or always return a producer that is able to return the expected instance.
         /// </para>
         /// </remarks>
         /// <param name="throwOnFailure">The indication whether the method should return null or throw
         /// an exception when the type is not registered.</param>
         /// <returns>An <see cref="InstanceProducer"/> or <b>null</b>.</returns>
-        public InstanceProducer<TService>? GetRegistration<TService>(bool throwOnFailure)
+        public InstanceProducer? GetRegistration<TService>(bool throwOnFailure)
         {
-            return (InstanceProducer<TService>?)this.GetRegistration(typeof(TService), throwOnFailure);
+            return this.GetRegistration(typeof(TService), throwOnFailure);
         }
 
         /// <summary>