changed jndi naming and caching policy