made some minor improvements to the automated caching system
Merge remote-tracking branch 'origin/master'