added router options to cache breaker, cleanup