Minor cleanup of MemoryStorageStrategy along with synchronization/lock additions to prevent race conditions.