Misc updates for multisite and caching