Also it turned out TCBS wasn't being cached (!) but that is now fixed by bug 963236 on master ;)