@bitter-ability-32190 probably worth merging

main

in given there’s a pertinent caching fix in there