Fix/refactor tcaches synchronization. am: f674f43893
am: 412112bb89

Change-Id: I2d7304bc3c62cbccbe34494155a5cc2f975b7965