Caching upgraded and images now have a 404 check.