Fix service map cache issue