It appears that writing the existing lockfile before regenerating a new one can help speed some resolutions up.

Closes #815