Simplify some fields setup

Now that fields is a cached_property, we have access to the instance and thus,
we can pass the right parameters instead of having to change them on __init__
or some other place like that.

Change-Id: I4200820692496f20457171960e99cea8c0d15c95