Merge "fix a bug introduced when prepared-statement cache was made LRU-based"