Yeah, you see my problem
What I have done "works" but I just don't know if it is the right thing to do. I guess I can just give it to Kovid as is and he can tweak his API if he wants to try to avoid the issue. Though I am not sure how easy that will be and what about the proxy type approach we are using in most of the plugins etc.