better support for cached containers
Merge branch 'master' of github.com:Opine-Org/Framework