SSLR-287 Fix memoization