Cached function call on all the things
Var name change
Merge pull request #4 from borkweb/6310-followup

Cached function call on all the things