Cache definition tweaks