Create class decorator and start using that instead of the old one to try to preserve state