diff --git a/CachingStore.h b/CachingStore.h
index 98e8d043..05940c26 100644
--- a/CachingStore.h
+++ b/CachingStore.h
@@ -133,6 +133,7 @@ void CachingStore<Resource, CachedResourceRef, Key>::remove(const Key &key, std:
 
   //Wait for last resource user to release it
   auto resourceToRemove = insertResult.first->second.get_future().get();
+  _resourcesToRemove.erase(key); //TODO Is this erase causing a race condition?
 
   _baseStore->removeFromBaseStore(std::move(resourceToRemove));
 }