CLC-4125 - Update the caching for the photos