wip refactoring futures
fix Cache Management