Caching features pretty much done, and a bunch of clearing up.

This will be the last commit (from me) for this particular repo, I'm moving it to SourceKettle because now I'm going to start working on some very Southampton-specific tweaks.