Revert "Fix expire time of cache using TimeUnits" Master was actually compatible with Gerrit master and stable-2.16 and the fix wasn't needed after all. This reverts commit 3816915fc0e882d8391f0dc62ef8f69b72aca91e. Change-Id: Iaa39a7db734e391652d729a6ed2e70f37913540d