Agreed. This is a problem that I hope Jekyll manages to solve and it looks like they may be getting closer: https://github.com/jekyll/jekyll/pull/3116