Merge "Put the filecache save step before the error buffer closes so those errors...