Images cache, minor bug fixes