Fixes tag cache test issues introduced in c6c4d5a8