OAuth improvements, working on caching on the server