p3 for caching credential fix
More cache invalidation and guards