wrong logic for cache merge
Merge pull request #169 from olivierbeytrison/master

Logic was incorrect in cache_add if control:Cache-Merge was set to no