Merge branch 'disable-log-cache'