Fixed a few image caching issues