Improve client refresh performance