cache fixed
fixed merge problems with cache