add memory caching :: a hack