Re-introduce string cache and clean up some code