Merge branch '5.4' into 6.2

* 5.4:
  [Tests] Migrate tests to static data providers
  [Cache] Only validate dbindex parameter when applicable

Author: nicolas-grekas