cache image + data structure optimization
Merge remote-tracking branch 'WMW-ios/master'