Refactoring Associations cache

Reduce duplication
add clarity