Fix attempt 1 for internal formatter caching