Using unified cache / Control cache identity

should be solving this.