diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 3c2f5a8ea6..bf404cf890 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta050" />
+    <PackageReference Include="Examine" Version="1.0.0-beta053" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index ac9683f3f2..499de741d8 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -97,7 +97,7 @@ namespace Umbraco.Examine
             ProfilingLogger profilingLogger,
             ILocalizationService languageService,
             IContentValueSetValidator validator,
-            IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypes = null)
+            IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
             : base(name, fieldDefinitions, luceneDirectory, defaultAnalyzer, profilingLogger, validator, indexValueTypes)
         {
             if (validator == null) throw new ArgumentNullException(nameof(validator));
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index 8d84e417d4..9cf4d05c75 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Examine
             Analyzer defaultAnalyzer,
             ProfilingLogger profilingLogger,
             IValueSetValidator validator = null,
-            IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypes = null)
+            IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
             : base(name, fieldDefinitions, luceneDirectory, defaultAnalyzer, validator, indexValueTypes)
         {
             ProfilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger));
@@ -125,14 +125,14 @@ namespace Umbraco.Examine
         /// </summary>
         /// <param name="indexValueTypesFactory"></param>
         /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypesFactory = null)
+        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypesFactory = null)
         {
             //if config based then ensure the value types else it's assumed these were passed in via ctor
             if (_configBased)
             {
                 foreach (var field in UmbracoIndexFieldDefinitions)
                 {
-                    FieldDefinitionCollection.TryAdd(field.Name, field);
+                    FieldDefinitionCollection.TryAdd(field);
                 }
             }
             
@@ -200,7 +200,7 @@ namespace Umbraco.Examine
                     ConfigIndexCriteria = CreateFieldDefinitionsFromConfig(indexSet);
                     foreach (var fieldDefinition in ConfigIndexCriteria.StandardFields.Union(ConfigIndexCriteria.UserFields))
                     {
-                        FieldDefinitionCollection.TryAdd(fieldDefinition.Name, fieldDefinition);
+                        FieldDefinitionCollection.TryAdd(fieldDefinition);
                     }
                     found = true;
                     break;
@@ -228,7 +228,7 @@ namespace Umbraco.Examine
                     ConfigIndexCriteria = CreateFieldDefinitionsFromConfig(indexSet);
                     foreach (var fieldDefinition in ConfigIndexCriteria.StandardFields.Union(ConfigIndexCriteria.UserFields))
                     {
-                        FieldDefinitionCollection.TryAdd(fieldDefinition.Name, fieldDefinition);
+                        FieldDefinitionCollection.TryAdd(fieldDefinition);
                     }
                 }
             }
diff --git a/src/Umbraco.Examine/UmbracoMemberIndex.cs b/src/Umbraco.Examine/UmbracoMemberIndex.cs
index 43962855c9..27490e0e18 100644
--- a/src/Umbraco.Examine/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine/UmbracoMemberIndex.cs
@@ -64,10 +64,10 @@ namespace Umbraco.Examine
         /// </summary>
         /// <param name="indexValueTypesFactory"></param>
         /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypesFactory = null)
+        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypesFactory = null)
         {
             var keyDef = new FieldDefinition("__key", FieldDefinitionTypes.Raw);
-            FieldDefinitionCollection.TryAdd(keyDef.Name, keyDef);
+            FieldDefinitionCollection.TryAdd(keyDef);
 
             return base.CreateFieldValueTypes(indexValueTypesFactory);
         }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index b31a78a08f..e7cc0c54aa 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta050" />
+    <PackageReference Include="Examine" Version="1.0.0-beta053" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.9</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 60e1324969..4bd30fa383 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta050" />
+    <PackageReference Include="Examine" Version="1.0.0-beta053" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ee27a05641..3a3f9ceedd 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -62,7 +62,7 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta050" />
+    <PackageReference Include="Examine" Version="1.0.0-beta053" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>