Apply the same logic to the extends-cache setting too