Fix #21869 and #21870: handle CapsOf in more places #33017

Job	Run time
test_non_bootstrapped	0s
test	56m 33s
test_scala2_library_tasty	0s
test_windows_fast	32m 4s
test_windows_full	0s
MiMa	10m 39s
community_build_a	56m 40s
community_build_b	1h 30m 1s
community_build_c	1h 8m 18s
test_sbt	18m 3s
test_java8	0s
build-msi-package	0s
build-sdk-package / build	7m 41s
test-msi-package	0s
build-chocolatey-package / build	20s
test-chocolatey-package	0s
publish_nightly	0s
publish_release	0s
nightly_documentation	0s
open_issue_on_failure	0s
	5h 40m 19s

Provide feedback