Add more caching configuration to bl-override-ehcache.xml and bl-override-ehcache-admin.xml