Fix load problem
Merge remote-tracking branch 'refs/remotes/origin/enhancement-Caching' into dev-v3