cache is calls

This would resolve #5043.

Will almost certainly cause a pile of test failures.