Merge "Implement FlushCaches TODO" into lmp-preview-dev