TK-116225 Updated EHcache datatstore for changes to dataqstore contract. (not implemented yet though)