Fix remove layout cache