More warning fixes, ImageCache improvements