This removes the use of the primary id keys in the cache tables. The upgrade part of this
has gone stale a few times but I feel sure that this part is tested & confirmed
and committing this part will make testing easier