Continuing performance tuning. Added no-weight-cacheing flag.