revert back cache implementation