Remove extra traces of file-handle-caching