Add cache negotiation patch
Merge branch 'master' into custom-link