Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationCreateExtensions.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -79,7 +79,7 @@
             }
             if (input.HydraulicBoundaryLocation != null)
             {
-                entity.HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(input.HydraulicBoundaryLocation);
+                entity.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation);
             }
 
             entity.BreakWaterHeight = input.BreakWater.Height.ToNaNAsNull();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs
===================================================================
diff -u -r06b82f3137d117242ecf5f69bded51c103216c0a -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs	(.../HydraulicBoundaryLocationCalculationCreateExtensions.cs)	(revision 06b82f3137d117242ecf5f69bded51c103216c0a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs	(.../HydraulicBoundaryLocationCalculationCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -55,7 +55,7 @@
             var hydraulicLocationCalculationEntity = new HydraulicLocationCalculationEntity
             {
                 ShouldIllustrationPointsBeCalculated = Convert.ToByte(calculation.InputParameters.ShouldIllustrationPointsBeCalculated),
-                HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(calculation.HydraulicBoundaryLocation)
+                HydraulicLocationEntity = registry.Get(calculation.HydraulicBoundaryLocation)
             };
 
             CreateHydraulicBoundaryLocationOutput(hydraulicLocationCalculationEntity, calculation.Output);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -54,7 +54,7 @@
 
             if (registry.Contains(location))
             {
-                return registry.Get<HydraulicLocationEntity>(location);
+                return registry.Get(location);
             }
 
             var entity = new HydraulicLocationEntity
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rb1f6aa284362d588deb08425fbc684c60c32c63d -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision b1f6aa284362d588deb08425fbc684c60c32c63d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -175,7 +175,7 @@
 
             if (inputParameters.HydraulicBoundaryLocation != null)
             {
-                entity.HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(inputParameters.HydraulicBoundaryLocation);
+                entity.HydraulicLocationEntity = registry.Get(inputParameters.HydraulicBoundaryLocation);
             }
         }
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -87,8 +87,8 @@
         private readonly Dictionary<SurfaceLineEntity, MacroStabilityInwardsSurfaceLine> macroStabilityInwardsSurfaceLines =
             CreateDictionary<SurfaceLineEntity, MacroStabilityInwardsSurfaceLine>();
 
-        private readonly Dictionary<object, HydraulicBoundaryLocation> hydraulicLocations =
-            CreateDictionary<object, HydraulicBoundaryLocation>();
+        private readonly Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation> hydraulicLocations =
+            CreateDictionary<HydraulicLocationEntity, HydraulicBoundaryLocation>();
 
         private readonly Dictionary<DuneLocationEntity, DuneLocation> duneLocations =
             CreateDictionary<DuneLocationEntity, DuneLocation>();
@@ -833,9 +833,9 @@
         /// has been registered for <paramref name="model"/>.</exception>
         /// <remarks>Use <see cref="Contains(HydraulicBoundaryLocation)"/> to find out
         /// whether a create operation has been registered for <paramref name="model"/>.</remarks>
-        internal T Get<T>(HydraulicBoundaryLocation model) where T : class
+        internal HydraulicLocationEntity Get(HydraulicBoundaryLocation model) 
         {
-            return Get(hydraulicLocations, model) as T;
+            return Get(hydraulicLocations, model);
         }
 
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision ab1121dee05c5484181bb1b0470d49eb48d325fe)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -92,7 +92,7 @@
 
             if (inputParameters.HydraulicBoundaryLocation != null)
             {
-                entity.HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(inputParameters.HydraulicBoundaryLocation);
+                entity.HydraulicLocationEntity = registry.Get(inputParameters.HydraulicBoundaryLocation);
             }
         }
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -55,7 +55,7 @@
 
             if (input.HydraulicBoundaryLocation != null)
             {
-                entityToUpdate.HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(input.HydraulicBoundaryLocation);
+                entityToUpdate.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation);
             }
 
             if (input.ForeshoreProfile != null)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -r7e027e29474068f4fc2f74f97793773fe5ec57a3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 7e027e29474068f4fc2f74f97793773fe5ec57a3)
@@ -265,7 +265,7 @@
             public HydraulicBoundaryLocationRegistryTest() : base(
                 (r, e, m) => r.Register(e, m),
                 (r, m) => r.Contains(m),
-                (r, m) => r.Get<HydraulicLocationEntity>(m)) {}
+                (r, m) => r.Get(m)) {}
 
             protected override HydraulicBoundaryLocation CreateDataModel()
             {