Here I was basically just trying to accommodate the change in the GWC API in a minimal way