diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
index 310d860c50..7cc92bc69f 100644
--- a/src/Umbraco.Core/Cache/CacheKeys.cs
+++ b/src/Umbraco.Core/Cache/CacheKeys.cs
@@ -28,7 +28,5 @@ namespace Umbraco.Core.Cache
public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";
- //NOTE: I'm pretty sure we don't cache anything with this key anymore
- internal const string PropertyTypeTabCacheKey = "Tab_PropertyTypes_Content:";
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
index 9b9c52e6c5..6182e03f3b 100644
--- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
@@ -70,10 +70,7 @@ namespace Umbraco.Web.Cache
foreach (var p in contentType.PropertyTypes)
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.PropertyTypeCacheKey + p.Id);
- }
- //clears the cache for all tabs
- var regexMatch = string.Format("{0}_{1}_{2}", CacheKeys.PropertyTypeTabCacheKey, @"\d+", contentType.Id);
- ApplicationContext.Current.ApplicationCache.ClearCacheByKeyExpression(regexMatch);
+ }
//clears the cache associated with the content type properties collection
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.ContentTypePropertiesCacheKey + contentType.Id);
//clears the dictionary object cache of the legacy ContentType
diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs
index c025ef35c2..1d327976b2 100644
--- a/src/umbraco.cms/businesslogic/ContentType.cs
+++ b/src/umbraco.cms/businesslogic/ContentType.cs
@@ -1405,15 +1405,11 @@ namespace umbraco.cms.businesslogic
///
/// The id.
///
- [Obsolete("Cache for tabs is automatically refreshed by Umbraco when Property types are modified")]
+ [Obsolete("There is no cache to flush for tabs")]
public static void FlushCache(int id, int contentTypeId)
{
- ApplicationContext.Current.ApplicationCache.ClearCacheItem(GenerateCacheKey(id, contentTypeId));
- }
-
- private static string GenerateCacheKey(int tabId, int contentTypeId)
- {
- return String.Format("{0}_{1}_{2}", CacheKeys.PropertyTypeTabCacheKey, tabId, contentTypeId);
+ //at some stage there was probably caching for tabs but this hasn't been in place for some time, so this method
+ //now does nothing.
}
///