Fixed up the cycle check code. Also added a interceptor implementation for the serializer