offline storage support - fixes #5