Update to intervention/image 2.0 and fix caching