changed parameters class, corrected caches