Enhanced caching strategy.  Fixed issue with Hole scaffolding.