fixed #618 added caching to apartment