Added some memoizer