Revert "Fixing internal caching + test"

This reverts commit fc1b75c9af6139066f70ab950ab3892f5fd564d3.