Fixed image caching issue and a pawn behavior issue