Improve validations and cleanup for concurrent refresh.