Fix bug in cache
Merge commit '57d9fbd' into llvm-dev