Updated to cache file descriptors