New adaptable disk cache - tests and bug fixing.
Merge remote-tracking branch 'origin/master'