Fix loading images which were cached
Fix a merge error (I kept a deleted file from master)