Remove ehcache dependency