GUI-436
re-factored image caching so that it resides in 1 place