Addressed code review comments on callsite cache