Small patch that removes cache more agressively. Could solve the issue
with the rearrangement of widgets - at least on my dev. it was solved.