s3-idmap: Rework idmap_cache to store ID_TYPE_BOTH values