Revert "Revert "Set 1 hour timeout for entities cached on the client.""

This reverts commit 1e8fc237dfd1c3056db5e596a6d540c81ad6a947

Change-Id: Ibc9c92cad1d6ed56ba5d24d4c1c05a36d5ffc7f5
Merge "Revert "Revert "Set 1 hour timeout for entities cached on the client."""