Merge changes If4d5536b,I7a385035 into main

* changes:
  Move force-overlay-config-value to use WifiResourceCache
  Add resource cache