Add more caching patches