Remove ehcache implementation at the moment and fix query performance problem.