Further work on caching issues

**Describe the bug**
Some caching issues have been fixed in #1822 but it also mentions further required fixes. See points 6 and 7 there.

I'm raising this to keep track of the fact that more needs to be done, but I don't have an understanding of what is needed. Feel free to edit this (or raise new separate issues if that's better).