initial implementation of context caching
misc fixes throughout stored object
Merge branch 'develop' into feature/cache_context