Handle TB in hands of cacher in correct way

Fixes #3234