Fixed #755: Caching configuration blocks might be merged incorrectly