diff --git a/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs b/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs
index 28ace91909c..eb93daf24f6 100644
--- a/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs	
+++ b/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs	
@@ -50,13 +50,13 @@ protected virtual string MappingCacheKey
         /// <inheritdoc/>
         public T GetSettings(ModuleInfo moduleContext)
         {
-            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(moduleContext.PortalID), 20, CacheItemPriority.AboveNormal, moduleContext), this.Load, false);
+            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(moduleContext.PortalID, moduleContext.TabModuleID), 20, CacheItemPriority.AboveNormal, moduleContext), this.Load, false);
         }
 
         /// <inheritdoc/>
         public T GetSettings(int portalId)
         {
-            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(portalId), 20, CacheItemPriority.AboveNormal, null, portalId), this.Load, false);
+            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(portalId, -1), 20, CacheItemPriority.AboveNormal, null, portalId), this.Load, false);
         }
 
         /// <inheritdoc/>
@@ -164,7 +164,9 @@ private void SaveSettings(int portalId, ModuleInfo moduleContext, T settings)
                     }
                 }
             });
-            DataCache.SetCache(this.CacheKey(portalId), settings);
+
+            DataCache.ClearCache(this.CacheKeyPortalPrefix(portalId));
+            DataCache.SetCache(this.CacheKey(portalId, moduleContext?.TabModuleID ?? -1), settings);
         }
 
         private T Load(CacheItemArgs args)
@@ -220,7 +222,17 @@ private T Load(CacheItemArgs args)
             return settings;
         }
 
-        private string CacheKey(int id) => $"Settings{this.MappingCacheKey}_{id}";
+        /// <summary>Gets the cache key for the given portal and tab module.</summary>
+        /// <param name="portalId">The portal ID.</param>
+        /// <param name="tabModuleId">The tab module ID.</param>
+        /// <remarks>When <paramref name="tabModuleId"/> is -1, the cache key is for portal settings instead.</remarks>
+        /// <returns>The cache key.</returns>
+        private string CacheKey(int portalId, int tabModuleId) => $"{this.CacheKeyPortalPrefix(portalId)}{tabModuleId}";
+
+        /// <summary>Gets the prefix of the cache key for the given portal.</summary>
+        /// <param name="portalId">The portal ID.</param>
+        /// <returns>The cache key prefix.</returns>
+        private string CacheKeyPortalPrefix(int portalId) => $"Settings{this.MappingCacheKey}_{portalId}_";
 
         /// <summary>Deserializes the property.</summary>
         /// <param name="settings">The settings.</param>