Use object cache in load method.
Merge remote-tracking branch 'upstream/master'