Improved expired token automatic refresh handling