WIP
Cache also indexed by id
WIP
WIP
WIP