Trying to not break caching functionality.