fixed caching bug and related issues

Presumably this comment should be deleted?  It's confusing.