fix issue of array override not working when cache is enabled
Merge remote-tracking branch 'origin/master'