memoize the special method
Merge remote-tracking branch 'refs/remotes/kali/bug/fix-memoize' into develop