Fix an issue with memoizing the client