Fixed charID issues and restored caching