LPS-33359

Too much regression, mike has contacted the ehcache guys, waiting for them to fix their issue.