Travis#185.2

We mock the CacheHandler since Travis sporadically reported a failing test.
 
Change-Id: I251ff28d0188ad84462ac2ed06d867bfdfa16e38