Restructure cache a bit - tagging is mandatory