Tests: Silence some noise
Add CacheServer interface and local implementation

Will replace current handling
Use new CacheServer interface