Remove use of deprecated Memoizable