Some cleanup of dist size - uses local version of template-cache