SEC-2732: ehcache-core -> ehcache