Merge pull request #572 from JWCook/cattrs

Add compatibility with cattrs 21.1