Added test handler, has to be removed again. Small changes to CacheProvider, WIP.