Fix cache settings properly this time