Issue #3097393 by godotislate, catch, berdir, jweowu, ndobromirov, wim leers, gapple: Cache tags grow endlessly (cherry picked from commit 2999d457)