is it better just to pass the class reference in and always create a new instance?  It breaks backwards compatibility but if it fixes a bug... :-)