Refactoring to prepare statement caching.