More ehcache cleanup