use datastore 3.1.1 and downgrade ehcache again