Fix circularity on GWC creation, a mock test fails because of this though