Merge branch 'bp/test-drop-caches'