A few more fixes to make sure that the caching actually works this time