Merge libdfscache on v.2.0 into master