[Cache] Remove a race condition
Merge pull request #22 from vicb/cache

[Cache] Remove a race condition