Revert "Revert "Temporary cache 44167""

This reverts commit 8a0681ef777bb05c0a1c46783dd66f4ad7e0983b.
Cache