Good suggestion. I'd like to do it in another PR, and you probably need to pay attention to it when calling getInstance.

I will add a TODO comment into the source code, Sounds good to you?