Fix support for expiring refresh tokens