User timezone caching

src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Drivers/UserTimeZoneDisplayDriver.cs

@@ -43,9 +43,6 @@ BuildEditorContext context
             if (await context.Updater.TryUpdateModelAsync(model, Prefix))
             {
                 userTimeZone.TimeZoneId = model.TimeZoneId;
-
-                // Remove the cache entry, don't update it, as the form might still fail validation for other reasons.
-                await _userTimeZoneService.UpdateUserTimeZoneAsync(user);
             }
 
             return await EditAsync(userTimeZone, context);

src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Handlers/TimeZoneUserEventHandler.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Users.Handlers;
+using OrchardCore.Users.TimeZone.Services;
+
+namespace OrchardCore.Users.TimeZone.Handlers;
+internal class TimeZoneUserEventHandler : UserEventHandlerBase
+{
+    private readonly UserTimeZoneService _userTimeZoneService;
+
+    public TimeZoneUserEventHandler(UserTimeZoneService userTimeZoneService) => _userTimeZoneService = userTimeZoneService;
+
+    public override async Task DeletedAsync(UserDeleteContext context)
+    {
+        await _userTimeZoneService.UpdateUserTimeZoneAsync(context.User);
+    }
+
+    public override async Task UpdatedAsync(UserUpdateContext context)
+    {
+        await _userTimeZoneService.UpdateUserTimeZoneAsync(context.User);
+    }
+}

src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs

@@ -1,8 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
+using OrchardCore.Users.Handlers;
 using OrchardCore.Users.Models;
 using OrchardCore.Users.TimeZone.Drivers;
+using OrchardCore.Users.TimeZone.Handlers;
 using OrchardCore.Users.TimeZone.Services;
 
 namespace OrchardCore.Users.TimeZone
@@ -15,6 +17,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<ITimeZoneSelector, UserTimeZoneSelector>();
             services.AddSingleton<UserTimeZoneService>();
             services.AddScoped<IDisplayDriver<User>, UserTimeZoneDisplayDriver>();
+            services.AddScoped<IUserEventHandler, TimeZoneUserEventHandler>();
         }
     }
 }