More flexible caching

[hadley]

Should be able to cache per package, and save to /restore from disk