Refactor OAuth to be stoarge oblivious