Removed caching; think it best to make it the client's responsibility.