Deal with some ehcache dependency issues in cache 1.1.1.