Offline cache fixes