api changes slightly, especially for each, but mostly sama sama
fix cache entry being not loaded test incomplete because of missing resolve_method