merged 5952 cache invalidator into 2014.11.20