Ensure Caching Works As Expected

[Oglopf]

In #1420 we introduced caching for the images. It appears some of these are still making requests even with caching enabled.

This is to investigate this work and ensure the caching is working as expected before releasing in 2.1.

┆Issue is synchronized with this Asana task by Unito