Do not base cache tag on branch, but on package name
Resolve merge