JOJ-28: Caching and formatting fixes