Removed double memoization