Improved caching

This release includes an improved caching mechanism (safe access to cache maps, context support, proper clean-up) along with several fixes and enchancements.