Improve encapsulation of the cache

[darcey]

The cache is mostly encapsulated from the generator, but currently the generator still has to worry about some aspects of this. It would be nice if all of the cache stuff could be handled automatically so that the generator does not need to know anything about it (or even know that the cache exists).