Adding working implementation without a cache