DataMan caching enhancements.
Bug fixes and better Caching