Add back accidentally removed functor caches

Rosen Matevrequested to merge
rm-fix-moorecache into 2024-patches

removed unintentionally in !3333 (merged)

Merge request reports