Remove secondary caching in ContentDefinitionManager, improve error message in DataMigrationManager

src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs

@@ -156,8 +156,6 @@ static async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext cont
             services.AddScoped<IContentHandleProvider, ContentItemIdHandleProvider>();
             services.AddScoped<IContentItemIndexHandler, ContentItemIndexCoordinator>();
 
-            services.AddDataMigration<Migrations>();
-
             // Common Part
             services.AddContentPart<CommonPart>()
                 .UseDisplayDriver<DateEditorDriver>()
@@ -242,6 +240,16 @@ public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilde
         }
     }
 
+    [Feature("OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget")]
+    public class ExportContentToDeploymentTargetStartup : StartupBase
+    {
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.AddDataMigration<Migrations>();
+        }
+    }
+
+
     [RequireFeatures("OrchardCore.Deployment")]
     public class DeploymentStartup : StartupBase
     {

src/OrchardCore/OrchardCore.ContentManagement/ContentDefinitionManager.cs

@@ -72,11 +72,6 @@ public async Task<ContentTypeDefinition> LoadTypeDefinitionAsync(string name)
         {
             ArgumentException.ThrowIfNullOrEmpty(name);
 
-            if (_scopedTypeDefinitions.TryGetValue(name, out var typeDefinition))
-            {
-                return typeDefinition;
-            }
-
             var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
             return LoadTypeDefinition(document, name);
@@ -97,11 +92,6 @@ public async Task<ContentPartDefinition> LoadPartDefinitionAsync(string name)
         {
             ArgumentException.ThrowIfNullOrEmpty(name);
 
-            if (_scopedPartDefinitions.TryGetValue(name, out var partDefinition))
-            {
-                return partDefinition;
-            }
-
             var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
             return LoadPartDefinition(document, name);