fixes #6313 Cache Drop-down list

Fixed the issue and pushed the code for review, please check it.