Use Memoizable for memoization
Cleanup for version 6