Merge "Replace some calls to wfGetMainCache()"