Simplify/fix merge when using proxy cache