Router & cache bug fixed