Not complete yet, but getting there.
Since the actual auto-cache now happens elsewhere, this cleans up a lot of dead code.