Improvements to caching and binding