Move Memoizer so that it wraps FileStitcher

Otherwise, file grouping behaves incorrectly.