Clearing up bugs previously obfuscated by caching issues