I really don’t see broken images often, it doesn’t bother me at all. I’d prefer to keep Option #2, especially if we could increase the period of how long the images are stored in the local proxy.