Removed cyclic dep in cache/load