Frozen-Layer cache fix