Remove compcache workaround

* Fixed upstream