(hopefully) more sensible caching and other things/fixes