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

Change-Id: I35c4bb99f921ec53e6b4d3f7339c158a5884e984