we're caching the lookup fn to avoid multiple wrapping
Merge remote-tracking branch 'origin/master'