Fixes #4. Fixed data races with UUID v1/v2 storage access