[test] manipulate cached items
[build] closing markers + fixes