Merge "dscpPolicyTest: make it actually test caching" into main