Revert "Avoid potential race conditions." This commit was causing some of our cache unit tests to fail, so it'll need to be looked at more closely.

This reverts commit ef7f40b7ccea7e97024eb59fbd68b82ddebd15f5.