Draft: fix: fix circular dependency

Experimental: I'm not yet sure if this is a fix. This looked like a place where a circular dependency could originate. This is for @sidorelauku to experiment with.