Slim down wbCurrentSite to only hold information we need

Also removed some old temporary caching code

Change-Id: I6eb37bcc8641d712f686a927d6a6387a28abae8f
Merge "Slim down wbCurrentSite to only hold information we need"