diff --git a/src/Umbraco.Core/Cache/StaticCacheProvider.cs b/src/Umbraco.Core/Cache/StaticCacheProvider.cs index 07bf9fb959..765e84fd7c 100644 --- a/src/Umbraco.Core/Cache/StaticCacheProvider.cs +++ b/src/Umbraco.Core/Cache/StaticCacheProvider.cs @@ -27,19 +27,19 @@ namespace Umbraco.Core.Cache public override void ClearCacheObjectTypes(string typeName) { - _staticCache.RemoveAll(kvp => kvp.Value.GetType().ToString().InvariantEquals(typeName)); + _staticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName)); } public override void ClearCacheObjectTypes() { var typeOfT = typeof (T); - _staticCache.RemoveAll(kvp => kvp.Value.GetType() == typeOfT); + _staticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT); } public override void ClearCacheObjectTypes(Func predicate) { var typeOfT = typeof(T); - _staticCache.RemoveAll(kvp => kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value)); + _staticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value)); } public override void ClearCacheByKeySearch(string keyStartsWith)