Fix cleaning of widgetset and unit cache

Change-Id: I614a34a6bf5a9d4f1274f54af68960e0bfa5b30c