RIOS-18 Thumbnails added and using cacheing