Fixed #2910

src/Ombi.Helpers/CacheService.cs

@@ -28,18 +28,15 @@ namespace Ombi.Helpers
                 return result;
             }
 
-            using (await _mutex.LockAsync())
+            if (_memoryCache.TryGetValue(cacheKey, out result))
             {
-                if (_memoryCache.TryGetValue(cacheKey, out result))
-                {
-                    return result;
-                }
-
-                result = await factory();
-                _memoryCache.Set(cacheKey, result, absoluteExpiration);
-
                 return result;
             }
+
+            result = await factory();
+            _memoryCache.Set(cacheKey, result, absoluteExpiration);
+
+            return result;
         }
 
         public void Remove(string key)
@@ -47,34 +44,34 @@ namespace Ombi.Helpers
             _memoryCache.Remove(key);
         }
 
-        
+
-           
+
-            public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration)
+        public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration)
+        {
+            // locks get and set internally
+            if (_memoryCache.TryGetValue<T>(cacheKey, out var result))
             {
-                // locks get and set internally
+                return result;
-                if (_memoryCache.TryGetValue<T>(cacheKey, out var result))
+            }
+
+            lock (TypeLock<T>.Lock)
+            {
+                if (_memoryCache.TryGetValue(cacheKey, out result))
                 {
                     return result;
                 }
 
-                lock (TypeLock<T>.Lock)
+                result = factory();
-                {
+                _memoryCache.Set(cacheKey, result, absoluteExpiration);
-                    if (_memoryCache.TryGetValue(cacheKey, out result))
-                    {
-                        return result;
-                    }
 
-                    result = factory();
+                return result;
-                    _memoryCache.Set(cacheKey, result, absoluteExpiration);
-
-                    return result;
-                }
             }
+        }
+
+        private static class TypeLock<T>
+        {
+            public static object Lock { get; } = new object();
+        }
 
-            private static class TypeLock<T>
-            {
-                public static object Lock { get; } = new object();
-            }
-        
     }
 }

src/Ombi.Schedule/Jobs/Ombi/MediaDatabaseRefresh.cs

@@ -22,6 +22,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             _plexRepo = plexRepo;
             _embyRepo = embyRepo;
             _embyContentSync = embySync;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<PlexSettings> _settings;

src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs

@@ -57,6 +57,10 @@ namespace Ombi.Schedule.Jobs.Ombi
             _ombiSettings = ombiSettings;
             _plexSettings = plexSettings;
             _embySettings = embySettings;
+            _ombiSettings.ClearCache();
+            _plexSettings.ClearCache();
+            _emailSettings.ClearCache();
+            _customizationSettings.ClearCache();
         }
 
         private readonly IPlexContentRepository _plex;

src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs

@@ -57,6 +57,7 @@ namespace Ombi.Schedule.Jobs.Plex
             EpisodeSync = epsiodeSync;
             Metadata = metadataRefresh;
             Checker = checker;
+            Plex.ClearCache();
         }
 
         private ISettingsService<PlexSettings> Plex { get; }

src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs

@@ -26,6 +26,7 @@ namespace Ombi.Schedule.Jobs.Plex
             _api = plexApi;
             _repo = repo;
             _availabilityChecker = a;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<PlexSettings> _settings;

src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs

@@ -24,6 +24,8 @@ namespace Ombi.Schedule.Jobs.Plex
             _log = log;
             _plexSettings = plexSettings;
             _userManagementSettings = ums;
+            _plexSettings.ClearCache();
+            _userManagementSettings.ClearCache();
         }
 
         private readonly IPlexApi _api;

src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs

@@ -22,6 +22,7 @@ namespace Ombi.Schedule.Jobs.Radarr
             RadarrApi = radarrApi;
             Logger = log;
             _ctx = ctx;
+            RadarrSettings.ClearCache();
         }
 
         private ISettingsService<RadarrSettings> RadarrSettings { get; }

src/Ombi.Schedule/Jobs/SickRage/SickRageSync.cs

@@ -22,6 +22,7 @@ namespace Ombi.Schedule.Jobs.SickRage
             _api = api;
             _log = l;
             _ctx = ctx;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<SickRageSettings> _settings;

src/Ombi.Schedule/Jobs/Sonarr/SonarrSync.cs

@@ -25,6 +25,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
             _api = api;
             _log = l;
             _ctx = ctx;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<SonarrSettings> _settings;