fixed local xml data cache usage problem
Merge remote-tracking branch 'upstream/master'