Tiny data changes.
Don't shuffle questions, just answers. Do that using a custom template filter as its part of the presentation.