Crawler state persistence more reliable

Created by: AnhNhan

Atomic save