Revert caching. Broken on ntebook