This is reusing normal cache which doesn't contain half the things (cherry picked from commit 236ab8dbed)
236ab8dbed