Improve authentication handling (save expire time for token)