comment converning cache-related optimisation that might be added
Merge remote-tracking branch 'upstream/master'