Don't use a singleton, switch to a class-based approach.