Solved issues that happened by merge, problems with mapcache and pre-processing