13.x
Use new bootstrap/cache for cached optimizations loaded during bootstrapping.
Preserve expectsJson() fallback for JSON exception rendering (#6837)
Uses unqualified names (#6760)