Issue #86: Correcting issues with new caching.