renamed cache. added more general classes