refactor the repository excluding nexsus cache