improve warehouse + improve delivery method + fix cache context