Use storage instead of finders directly for infile path

Pull request for issue #299