fix child caching from undefined to array
Merge remote-tracking branch 'origin/next' into next