Eac/versioning race

@staugaard @grosser Fixes the multi-version cache/racing issues