Still cache stuff (fixes another problem).