SW - Use memoiser instead of private instance