grill client close issue fixed

I don't think there's any problem in making them static. It's anyway returning a singleton. And Without making them static, adding a single hook would become complicated.