Update commands to use cached areas