Fixed #679: Caching configuration blocks might be merged incorrectly