cache is calls

This would resolve #5043