Updates to support HDFS caching changes.

Change-Id: Ia7106c4925a17e1ebe535e653949d59d95092f7c