Fix caching issue and add associations to models