Revert "Faster workaround for caching bugs when getting diagnostics"

This reverts commit a389e032840ef310c12592f2d7333ba062d1c38a.