Get and Set are reworked

It makes more sense this way for caching