* This commit provides the proper fix mentioned in cd423d9d * We still keep the caching implemented in cd423d9d