add caching for thumbs from image services
merge with upstream