CacheHandling cleanup + more tests