TK-116206 ADded patch to ehcache datastore