Merge "Re-enable file descriptor caching and add option to skip caching"