MDL-41106 cache: tidied up several elements