Move unsafe parts of AdapterInventory to separate class