Added missing image check and cached images