Is Máscara contra Caballero coming back?

A famous singer gets the chance to live in anonymity when he fills in for a wrestler. However, he is on his heels by a journalist determined to end his career... and steal his heart.