cleanup cache variables

Especially since I got them backwards originally and was too lazy to
fix that.