Revert "Merge remote-tracking branch 'upstream/get-type-remove-cache'" This reverts commit 16f9e5de46448d334f13aea853ae6d13b3d36581, reversing changes made to 608fac6f22814e3eeb4609c80c0b5f08205e24ed. Keep the cache but add a way to rebuild it properly