More aggressive caching
Merge pull request #481 from dswd/caching

More aggressive caching