[WIP] Fix cache race