ISPN-2664 Cleanup caches after each method to avoid non-empty caches