bugfixing in the caching routine, caching now tested for heatflux, merging...

bugfixing in the caching routine, caching now tested for heatflux, merging worked, saving worked, loading worked so far