:construction: adjusted the caching mechanism to work with the joins