Added ability to configure cache directory

Change-Id: I9ec2eda729a5db98bd437e148fba1ef4b39e17b1
Merge "Added ability to configure cache directory"