Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache'