r2766 - listCells(): lookup and update both entity caches