Tidy up some DLS cache code#132416

joegallo merged 12 commits intoelastic:mainelastic/elasticsearch:mainfrom

joegallo:tidy-up-some-dls-cache-codejoegallo/elasticsearch:tidy-up-some-dls-cache-codeCopy head branch name to clipboard