updated test and portal collection to complete entity classes
implemented caching and portalmanger