Use session for caching various things for SAML SSO instead of a custom cache
Picking up core changes in Tomcat