Cache fixes. Hey, what did you expect?