Merge "Avoid muliple cache calls to explicitly defined tags"