Merged #83 "Fix cache miss in repository model retrieval"