Some better cache handling, which should allow us to deal with managing our cache size more easily.