Model.cache, common/caminio -> caminio, design improvements