[Cache] Remove a race condition