Optimization: check against previous file name and use its FileEntry.