Attempt to mitigate session expiry issues