Cache fix round 3

grrr