Extend the ValuesAtScope cache to cover all expressions, not just