Further local cache refinements