Fix for non working mem cache  from master