Repair caching.
Merge pull request #1268 from melbit-deanfogarty/master

Repair caching.