DDF-938 made sure that the file backed streams are cleaned up after use