caching at repository level caused issues, pulled it back into service for now