LPS-48579 Avoid hitting the db