attempt to fix up cache in 3.3
crappy lazy loading
Merge branch 'develop' into feature_675