Merge "objectcache: make newFromId()/newWANcacheFromId()/getDefaultKeyspace() private"