Adding caching and undefining a few methods on resources that broke