Removed premature optimization (caching)