cache refactoring. Cache-cleaner moved to singleton