Wiwidget cache code cleanup and bug fixesdget ww