Recheck if empty under lock, early exit

src/Nethermind/Nethermind.Core/Collections/CollectionExtensions.cs

@@ -33,13 +33,20 @@ public static void AddRange<T>(this ICollection<T> list, params T[] items)
         public static bool NoResizeClear<TKey, TValue>(this ConcurrentDictionary<TKey, TValue>? dictionary)
                 where TKey : notnull
         {
-            if (dictionary is null || dictionary.IsEmpty)
+            if (dictionary?.IsEmpty ?? true)
             {
                 return false;
             }
 
             using var handle = dictionary.AcquireLock();
 
+            // Recheck under lock, so not to over clear which is expensive.
+            // May have cleared while waiting for lock.
+            if (dictionary.IsEmpty)
+            {
+                return false;
+            }
+
             ClearCache<TKey, TValue>.Clear(dictionary);
             return true;
         }

src/Nethermind/Nethermind.State/PersistentStorageProvider.cs

@@ -330,7 +330,6 @@ public void CommitTrees(long blockNumber)
             _toUpdateRoots.Clear();
             // only needed here as there is no control over cached storage size otherwise
             _storages.Clear();
-            _preBlockCache?.NoResizeClear();
         }
 
         private StorageTree GetOrCreateStorage(Address address)

src/Nethermind/Nethermind.State/StateProvider.cs

@@ -857,7 +857,6 @@ public void CommitTree(long blockNumber)
             }
 
             _tree.Commit(blockNumber);
-            _preBlockCache?.NoResizeClear();
         }
 
         public static void CommitBranch()