tried adding some caching with no luck